Merge branch 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / bgrt.c

diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
index be60399585456a76b973208c8674833c766fa824..a83e3c62c5a9d04e57a0fc644598d6e41d42c290 100644 (file)
--- a/drivers/acpi/bgrt.c
+++ b/drivers/acpi/bgrt.c
@@ -51,20 +51,14 @@ static ssize_t show_yoffset(struct device *dev,
 }
 static DEVICE_ATTR(yoffset, S_IRUGO, show_yoffset, NULL);
 
-static ssize_t show_image(struct file *file, struct kobject *kobj,
+static ssize_t image_read(struct file *file, struct kobject *kobj,
               struct bin_attribute *attr, char *buf, loff_t off, size_t count)
 {
        memcpy(buf, attr->private + off, count);
        return count;
 }
 
-static struct bin_attribute image_attr = {
-       .attr = {
-               .name = "image",
-               .mode = S_IRUGO,
-       },
-       .read = show_image,
-};
+static BIN_ATTR_RO(image, 0);  /* size gets filled in later */
 
 static struct attribute *bgrt_attributes[] = {
        &dev_attr_version.attr,
@@ -75,8 +69,14 @@ static struct attribute *bgrt_attributes[] = {
        NULL,
 };
 
+static struct bin_attribute *bgrt_bin_attributes[] = {
+       &bin_attr_image,
+       NULL,
+};
+
 static struct attribute_group bgrt_attribute_group = {
        .attrs = bgrt_attributes,
+       .bin_attrs = bgrt_bin_attributes,
 };
 
 static int __init bgrt_init(void)
@@ -86,9 +86,8 @@ static int __init bgrt_init(void)
        if (!bgrt_image)
                return -ENODEV;
 
-       sysfs_bin_attr_init(&image_attr);
-       image_attr.private = bgrt_image;
-       image_attr.size = bgrt_image_size;
+       bin_attr_image.private = bgrt_image;
+       bin_attr_image.size = bgrt_image_size;
 
        bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
        if (!bgrt_kobj)
@@ -98,14 +97,8 @@ static int __init bgrt_init(void)
        if (ret)
                goto out_kobject;
 
-       ret = sysfs_create_bin_file(bgrt_kobj, &image_attr);
-       if (ret)
-               goto out_group;
-
        return 0;
 
-out_group:
-       sysfs_remove_group(bgrt_kobj, &bgrt_attribute_group);
 out_kobject:
        kobject_put(bgrt_kobj);
        return ret;