diff options
Diffstat (limited to 'drivers/w1/w1.c')
-rw-r--r-- | drivers/w1/w1.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 1838cb29b646..f5c5b760ed7b 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
@@ -105,7 +105,9 @@ static ssize_t w1_slave_read_name(struct device *dev, struct device_attribute *a | |||
105 | return sprintf(buf, "%s\n", sl->name); | 105 | return sprintf(buf, "%s\n", sl->name); |
106 | } | 106 | } |
107 | 107 | ||
108 | static ssize_t w1_slave_read_id(struct kobject *kobj, char *buf, loff_t off, size_t count) | 108 | static ssize_t w1_slave_read_id(struct kobject *kobj, |
109 | struct bin_attribute *bin_attr, | ||
110 | char *buf, loff_t off, size_t count) | ||
109 | { | 111 | { |
110 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 112 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
111 | 113 | ||
@@ -135,7 +137,9 @@ static struct bin_attribute w1_slave_attr_bin_id = { | |||
135 | 137 | ||
136 | /* Default family */ | 138 | /* Default family */ |
137 | 139 | ||
138 | static ssize_t w1_default_write(struct kobject *kobj, char *buf, loff_t off, size_t count) | 140 | static ssize_t w1_default_write(struct kobject *kobj, |
141 | struct bin_attribute *bin_attr, | ||
142 | char *buf, loff_t off, size_t count) | ||
139 | { | 143 | { |
140 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 144 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
141 | 145 | ||
@@ -152,7 +156,9 @@ out_up: | |||
152 | return count; | 156 | return count; |
153 | } | 157 | } |
154 | 158 | ||
155 | static ssize_t w1_default_read(struct kobject *kobj, char *buf, loff_t off, size_t count) | 159 | static ssize_t w1_default_read(struct kobject *kobj, |
160 | struct bin_attribute *bin_attr, | ||
161 | char *buf, loff_t off, size_t count) | ||
156 | { | 162 | { |
157 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 163 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
158 | 164 | ||