diff options
Diffstat (limited to 'drivers/w1/slaves/w1_therm.c')
-rw-r--r-- | drivers/w1/slaves/w1_therm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 1a6937dc190b..4318935678c5 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c | |||
@@ -42,13 +42,13 @@ static u8 bad_roms[][9] = { | |||
42 | {} | 42 | {} |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); | 45 | static ssize_t w1_therm_read_bin(struct kobject *, struct bin_attribute *, |
46 | char *, loff_t, size_t); | ||
46 | 47 | ||
47 | static struct bin_attribute w1_therm_bin_attr = { | 48 | static struct bin_attribute w1_therm_bin_attr = { |
48 | .attr = { | 49 | .attr = { |
49 | .name = "w1_slave", | 50 | .name = "w1_slave", |
50 | .mode = S_IRUGO, | 51 | .mode = S_IRUGO, |
51 | .owner = THIS_MODULE, | ||
52 | }, | 52 | }, |
53 | .size = W1_SLAVE_DATA_SIZE, | 53 | .size = W1_SLAVE_DATA_SIZE, |
54 | .read = w1_therm_read_bin, | 54 | .read = w1_therm_read_bin, |
@@ -159,7 +159,9 @@ static int w1_therm_check_rom(u8 rom[9]) | |||
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
161 | 161 | ||
162 | static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count) | 162 | static ssize_t w1_therm_read_bin(struct kobject *kobj, |
163 | struct bin_attribute *bin_attr, | ||
164 | char *buf, loff_t off, size_t count) | ||
163 | { | 165 | { |
164 | struct w1_slave *sl = kobj_to_w1_slave(kobj); | 166 | struct w1_slave *sl = kobj_to_w1_slave(kobj); |
165 | struct w1_master *dev = sl->master; | 167 | struct w1_master *dev = sl->master; |