diff options
Diffstat (limited to 'drivers/w1/slaves/w1_ds2433.c')
-rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 8ea17a53eed8..cab56005dd49 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c | |||
@@ -91,8 +91,9 @@ static int w1_f23_refresh_block(struct w1_slave *sl, struct w1_f23_data *data, | |||
91 | } | 91 | } |
92 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ | 92 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ |
93 | 93 | ||
94 | static ssize_t w1_f23_read_bin(struct kobject *kobj, char *buf, loff_t off, | 94 | static ssize_t w1_f23_read_bin(struct kobject *kobj, |
95 | size_t count) | 95 | struct bin_attribute *bin_attr, |
96 | char *buf, loff_t off, size_t count) | ||
96 | { | 97 | { |
97 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 98 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
98 | #ifdef CONFIG_W1_SLAVE_DS2433_CRC | 99 | #ifdef CONFIG_W1_SLAVE_DS2433_CRC |
@@ -199,8 +200,9 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) | |||
199 | return 0; | 200 | return 0; |
200 | } | 201 | } |
201 | 202 | ||
202 | static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off, | 203 | static ssize_t w1_f23_write_bin(struct kobject *kobj, |
203 | size_t count) | 204 | struct bin_attribute *bin_attr, |
205 | char *buf, loff_t off, size_t count) | ||
204 | { | 206 | { |
205 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 207 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
206 | int addr, len, idx; | 208 | int addr, len, idx; |
@@ -252,7 +254,6 @@ static struct bin_attribute w1_f23_bin_attr = { | |||
252 | .attr = { | 254 | .attr = { |
253 | .name = "eeprom", | 255 | .name = "eeprom", |
254 | .mode = S_IRUGO | S_IWUSR, | 256 | .mode = S_IRUGO | S_IWUSR, |
255 | .owner = THIS_MODULE, | ||
256 | }, | 257 | }, |
257 | .size = W1_EEPROM_SIZE, | 258 | .size = W1_EEPROM_SIZE, |
258 | .read = w1_f23_read_bin, | 259 | .read = w1_f23_read_bin, |