diff options
Diffstat (limited to 'drivers/w1/slaves/w1_ds2760.c')
-rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 1f2b1a4d5fb3..ed6b0576208c 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c | |||
@@ -68,7 +68,8 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count) | |||
68 | return w1_ds2760_io(dev, buf, addr, count, 1); | 68 | return w1_ds2760_io(dev, buf, addr, count, 1); |
69 | } | 69 | } |
70 | 70 | ||
71 | static ssize_t w1_ds2760_read_bin(struct kobject *kobj, struct bin_attribute *attr, | 71 | static ssize_t w1_ds2760_read_bin(struct kobject *kobj, |
72 | struct bin_attribute *bin_attr, | ||
72 | char *buf, loff_t off, size_t count) | 73 | char *buf, loff_t off, size_t count) |
73 | { | 74 | { |
74 | struct device *dev = container_of(kobj, struct device, kobj); | 75 | struct device *dev = container_of(kobj, struct device, kobj); |
@@ -121,8 +122,6 @@ static void release_bat_id(int id) | |||
121 | mutex_lock(&bat_idr_lock); | 122 | mutex_lock(&bat_idr_lock); |
122 | idr_remove(&bat_idr, id); | 123 | idr_remove(&bat_idr, id); |
123 | mutex_unlock(&bat_idr_lock); | 124 | mutex_unlock(&bat_idr_lock); |
124 | |||
125 | return; | ||
126 | } | 125 | } |
127 | 126 | ||
128 | static int w1_ds2760_add_slave(struct w1_slave *sl) | 127 | static int w1_ds2760_add_slave(struct w1_slave *sl) |
@@ -174,8 +173,6 @@ static void w1_ds2760_remove_slave(struct w1_slave *sl) | |||
174 | platform_device_unregister(pdev); | 173 | platform_device_unregister(pdev); |
175 | release_bat_id(id); | 174 | release_bat_id(id); |
176 | sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr); | 175 | sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr); |
177 | |||
178 | return; | ||
179 | } | 176 | } |
180 | 177 | ||
181 | static struct w1_family_ops w1_ds2760_fops = { | 178 | static struct w1_family_ops w1_ds2760_fops = { |