ehci-omap: (mostly) cosmetic cleanups

[linux-2.6-omap-h63xx.git] / drivers / w1 / slaves / w1_ds2760.c

diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index 88a37fbccc3fd2da678c5ae579669e4a6ebf2c4d..ed6b0576208c27ca237670999ba328a267b350f9 100644 (file)
--- a/drivers/w1/slaves/w1_ds2760.c
+++ b/drivers/w1/slaves/w1_ds2760.c
@@ -68,8 +68,9 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
        return w1_ds2760_io(dev, buf, addr, count, 1);
 }
 
-static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off,
-                                 size_t count)
+static ssize_t w1_ds2760_read_bin(struct kobject *kobj,
+                                 struct bin_attribute *bin_attr,
+                                 char *buf, loff_t off, size_t count)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
        return w1_ds2760_read(dev, buf, off, count);
@@ -121,8 +122,6 @@ static void release_bat_id(int id)
        mutex_lock(&bat_idr_lock);
        idr_remove(&bat_idr, id);
        mutex_unlock(&bat_idr_lock);
-
-       return;
 }
 
 static int w1_ds2760_add_slave(struct w1_slave *sl)
@@ -174,8 +173,6 @@ static void w1_ds2760_remove_slave(struct w1_slave *sl)
        platform_device_unregister(pdev);
        release_bat_id(id);
        sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
-
-       return;
 }
 
 static struct w1_family_ops w1_ds2760_fops = {