w1: slaves: w1_ds2431: convert to use w1_family_ops.groups

This moves the sysfs file creation/removal to the w1 core by using the
.groups field, saving code in the slave driver.

Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 19 insertions, 24 deletions

diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c
index cef8605e43ec..9c4ff9d28adc 100644
--- a/drivers/w1/slaves/w1_ds2431.c
+++ b/drivers/w1/slaves/w1_ds2431.c
@@ -96,9 +96,9 @@ static int w1_f2d_readblock(struct w1_slave *sl, int off, int count, char *buf)
         return -1;
 }
 
-static ssize_t w1_f2d_read_bin(struct file *filp, struct kobject *kobj,
-                               struct bin_attribute *bin_attr,
-                               char *buf, loff_t off, size_t count)
+static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,
+                           struct bin_attribute *bin_attr, char *buf,
+                           loff_t off, size_t count)
 {
         struct w1_slave *sl = kobj_to_w1_slave(kobj);
         int todo = count;
@@ -202,9 +202,9 @@ retry:
         return 0;
 }
 
-static ssize_t w1_f2d_write_bin(struct file *filp, struct kobject *kobj,
-                                struct bin_attribute *bin_attr,
-                                char *buf, loff_t off, size_t count)
+static ssize_t eeprom_write(struct file *filp, struct kobject *kobj,
+                            struct bin_attribute *bin_attr, char *buf,
+                            loff_t off, size_t count)
 {
         struct w1_slave *sl = kobj_to_w1_slave(kobj);
         int addr, len;
@@ -264,29 +264,24 @@ out_up:
         return count;
 }
 
-static struct bin_attribute w1_f2d_bin_attr = {
-        .attr = {
-                .name = "eeprom",
-                .mode = S_IRUGO | S_IWUSR,
-        },
-        .size = W1_F2D_EEPROM_SIZE,
-        .read = w1_f2d_read_bin,
-        .write = w1_f2d_write_bin,
+static BIN_ATTR_RW(eeprom, W1_F2D_EEPROM_SIZE);
+
+static struct bin_attribute *w1_f2d_bin_attrs[] = {
+        &bin_attr_eeprom,
+        NULL,
 };
 
-static int w1_f2d_add_slave(struct w1_slave *sl)
-{
-        return sysfs_create_bin_file(&sl->dev.kobj, &w1_f2d_bin_attr);
-}
+static const struct attribute_group w1_f2d_group = {
+        .bin_attrs = w1_f2d_bin_attrs,
+};
 
-static void w1_f2d_remove_slave(struct w1_slave *sl)
-{
-        sysfs_remove_bin_file(&sl->dev.kobj, &w1_f2d_bin_attr);
-}
+static const struct attribute_group *w1_f2d_groups[] = {
+        &w1_f2d_group,
+        NULL,
+};
 
 static struct w1_family_ops w1_f2d_fops = {
-        .add_slave      = w1_f2d_add_slave,
-        .remove_slave   = w1_f2d_remove_slave,
+        .groups         = w1_f2d_groups,
 };
 
 static struct w1_family w1_family_2d = {