diff options
Diffstat (limited to 'drivers/w1/w1_smem.c')
-rw-r--r-- | drivers/w1/w1_smem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c index a54e425217a0..674eb75a9bad 100644 --- a/drivers/w1/w1_smem.c +++ b/drivers/w1/w1_smem.c | |||
@@ -36,8 +36,8 @@ MODULE_LICENSE("GPL"); | |||
36 | MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); | 36 | MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); |
37 | MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family."); | 37 | MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family."); |
38 | 38 | ||
39 | static ssize_t w1_smem_read_name(struct device *, char *); | 39 | static ssize_t w1_smem_read_name(struct device *, struct device_attribute *attr, char *); |
40 | static ssize_t w1_smem_read_val(struct device *, char *); | 40 | static ssize_t w1_smem_read_val(struct device *, struct device_attribute *attr, char *); |
41 | static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t); | 41 | static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t); |
42 | 42 | ||
43 | static struct w1_family_ops w1_smem_fops = { | 43 | static struct w1_family_ops w1_smem_fops = { |
@@ -47,14 +47,14 @@ static struct w1_family_ops w1_smem_fops = { | |||
47 | .rvalname = "id", | 47 | .rvalname = "id", |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static ssize_t w1_smem_read_name(struct device *dev, char *buf) | 50 | static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf) |
51 | { | 51 | { |
52 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | 52 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); |
53 | 53 | ||
54 | return sprintf(buf, "%s\n", sl->name); | 54 | return sprintf(buf, "%s\n", sl->name); |
55 | } | 55 | } |
56 | 56 | ||
57 | static ssize_t w1_smem_read_val(struct device *dev, char *buf) | 57 | static ssize_t w1_smem_read_val(struct device *dev, struct device_attribute *attr, char *buf) |
58 | { | 58 | { |
59 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | 59 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); |
60 | int i; | 60 | int i; |