Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

w1: slaves: w1_therm: 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: David Stevenson <david@avoncliff.com>
Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Cc: Michael Arndt <michael@scriptkiller.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+9 -15
+9 -15
drivers/w1/slaves/w1_therm.c
··· 59 59 module_param_named(strong_pullup, w1_strong_pullup, int, 0); 60 60 61 61 62 - static ssize_t w1_therm_read(struct device *device, 62 + static ssize_t w1_slave_show(struct device *device, 63 63 struct device_attribute *attr, char *buf); 64 64 65 - static struct device_attribute w1_therm_attr = 66 - __ATTR(w1_slave, S_IRUGO, w1_therm_read, NULL); 65 + static DEVICE_ATTR_RO(w1_slave); 67 66 68 - static int w1_therm_add_slave(struct w1_slave *sl) 69 - { 70 - return device_create_file(&sl->dev, &w1_therm_attr); 71 - } 72 - 73 - static void w1_therm_remove_slave(struct w1_slave *sl) 74 - { 75 - device_remove_file(&sl->dev, &w1_therm_attr); 76 - } 67 + static struct attribute *w1_therm_attrs[] = { 68 + &dev_attr_w1_slave.attr, 69 + NULL, 70 + }; 71 + ATTRIBUTE_GROUPS(w1_therm); 77 72 78 73 static struct w1_family_ops w1_therm_fops = { 79 - .add_slave = w1_therm_add_slave, 80 - .remove_slave = w1_therm_remove_slave, 74 + .groups = w1_therm_groups, 81 75 }; 82 76 83 77 static struct w1_family w1_therm_family_DS18S20 = { ··· 172 178 } 173 179 174 180 175 - static ssize_t w1_therm_read(struct device *device, 181 + static ssize_t w1_slave_show(struct device *device, 176 182 struct device_attribute *attr, char *buf) 177 183 { 178 184 struct w1_slave *sl = dev_to_w1_slave(device);