w1: use default attribute groups for w1 slave devices

As we have 2 sysfs files for the w1 slave devices, let the driver core
create / destroy them automatically by setting the default attribute
group for them, saving code and housekeeping logic.

Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 3c798db0152cccb1acf1ae02c48ba3258fb0941a..52b6c2f02f7ad8b2ac7db8b8db052d196386dc32 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -96,14 +96,15 @@ static void w1_slave_release(struct device *dev)
        complete(&sl->released);
 }
 
-static ssize_t w1_slave_read_name(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct w1_slave *sl = dev_to_w1_slave(dev);
 
        return sprintf(buf, "%s\n", sl->name);
 }
+static DEVICE_ATTR_RO(name);
 
-static ssize_t w1_slave_read_id(struct device *dev,
+static ssize_t id_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
        struct w1_slave *sl = dev_to_w1_slave(dev);
@@ -112,11 +113,14 @@ static ssize_t w1_slave_read_id(struct device *dev,
        memcpy(buf, (u8 *)&sl->reg_num, count);
        return count;
 }
+static DEVICE_ATTR_RO(id);
 
-static struct device_attribute w1_slave_attr_name =
-       __ATTR(name, S_IRUGO, w1_slave_read_name, NULL);
-static struct device_attribute w1_slave_attr_id =
-       __ATTR(id, S_IRUGO, w1_slave_read_id, NULL);
+static struct attribute *w1_slave_attrs[] = {
+       &dev_attr_name.attr,
+       &dev_attr_id.attr,
+       NULL,
+};
+ATTRIBUTE_GROUPS(w1_slave);
 
 /* Default family */
 
@@ -610,25 +614,6 @@ static int w1_bus_notify(struct notifier_block *nb, unsigned long action,
 
        switch (action) {
        case BUS_NOTIFY_ADD_DEVICE:
-               /* Create our sysfs files before userspace is told about it */
-               /* Create "name" entry */
-               err = device_create_file(&sl->dev, &w1_slave_attr_name);
-               if (err < 0) {
-                       dev_err(&sl->dev,
-                               "sysfs file creation for [%s] failed. err=%d\n",
-                               dev_name(&sl->dev), err);
-                       return err;
-               }
-
-               /* Create "id" entry */
-               err = device_create_file(&sl->dev, &w1_slave_attr_id);
-               if (err < 0) {
-                       dev_err(&sl->dev,
-                               "sysfs file creation for [%s] failed. err=%d\n",
-                               dev_name(&sl->dev), err);
-                       return err;
-               }
-
                /* if the family driver needs to initialize something... */
                if (sl->family->fops && sl->family->fops->add_slave &&
                    ((err = sl->family->fops->add_slave(sl)) < 0)) {
@@ -643,8 +628,6 @@ static int w1_bus_notify(struct notifier_block *nb, unsigned long action,
                /* Remove our sysfs files */
                if (sl->family->fops && sl->family->fops->remove_slave)
                        sl->family->fops->remove_slave(sl);
-               device_remove_file(&sl->dev, &w1_slave_attr_id);
-               device_remove_file(&sl->dev, &w1_slave_attr_name);
                break;
        }
        return 0;
@@ -662,6 +645,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
        sl->dev.driver = &w1_slave_driver;
        sl->dev.bus = &w1_bus_type;
        sl->dev.release = &w1_slave_release;
+       sl->dev.groups = w1_slave_groups;
 
        dev_set_name(&sl->dev, "%02x-%012llx",
                 (unsigned int) sl->reg_num.family,