Commit 94c9e6d6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

w1: slaves: w1_ds2423: 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: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 729fb9d3
...@@ -40,13 +40,7 @@ ...@@ -40,13 +40,7 @@
#define COUNTER_COUNT 4 #define COUNTER_COUNT 4
#define READ_BYTE_COUNT 42 #define READ_BYTE_COUNT 42
static ssize_t w1_counter_read(struct device *device, static ssize_t w1_slave_show(struct device *device,
struct device_attribute *attr, char *buf);
static struct device_attribute w1_counter_attr =
__ATTR(w1_slave, S_IRUGO, w1_counter_read, NULL);
static ssize_t w1_counter_read(struct device *device,
struct device_attribute *attr, char *out_buf) struct device_attribute *attr, char *out_buf)
{ {
struct w1_slave *sl = dev_to_w1_slave(device); struct w1_slave *sl = dev_to_w1_slave(device);
...@@ -128,19 +122,16 @@ static ssize_t w1_counter_read(struct device *device, ...@@ -128,19 +122,16 @@ static ssize_t w1_counter_read(struct device *device,
return PAGE_SIZE - c; return PAGE_SIZE - c;
} }
static int w1_f1d_add_slave(struct w1_slave *sl) static DEVICE_ATTR_RO(w1_slave);
{
return device_create_file(&sl->dev, &w1_counter_attr);
}
static void w1_f1d_remove_slave(struct w1_slave *sl) static struct attribute *w1_f1d_attrs[] = {
{ &dev_attr_w1_slave.attr,
device_remove_file(&sl->dev, &w1_counter_attr); NULL,
} };
ATTRIBUTE_GROUPS(w1_f1d);
static struct w1_family_ops w1_f1d_fops = { static struct w1_family_ops w1_f1d_fops = {
.add_slave = w1_f1d_add_slave, .groups = w1_f1d_groups,
.remove_slave = w1_f1d_remove_slave,
}; };
static struct w1_family w1_family_1d = { static struct w1_family w1_family_1d = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment