[NET]: Fix compat_sock_common_getsockopt typo.

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

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 420be14c2f8e35272d2d27ff101c03b97a056796..63c07243993c1b1b50c007ffc6773eccf2e98441 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <asm/atomic.h>
 
@@ -214,11 +215,12 @@ struct device w1_master_device = {
        .release = &w1_master_release
 };
 
-struct device_driver w1_slave_driver = {
+static struct device_driver w1_slave_driver = {
        .name = "w1_slave_driver",
        .bus = &w1_bus_type,
 };
 
+#if 0
 struct device w1_slave_device = {
        .parent = NULL,
        .bus = &w1_bus_type,
@@ -226,6 +228,7 @@ struct device w1_slave_device = {
        .driver = &w1_slave_driver,
        .release = &w1_slave_release
 };
+#endif  /*  0  */
 
 static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -383,13 +386,14 @@ int w1_create_master_attributes(struct w1_master *master)
        return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);
 }
 
-void w1_destroy_master_attributes(struct w1_master *master)
+static void w1_destroy_master_attributes(struct w1_master *master)
 {
        sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
 }
 
 #ifdef CONFIG_HOTPLUG
-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int w1_uevent(struct device *dev, char **envp, int num_envp,
+                       char *buffer, int buffer_size)
 {
        struct w1_master *md = NULL;
        struct w1_slave *sl = NULL;
@@ -409,23 +413,28 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer
                return -EINVAL;
        }
 
-       dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n", event_owner, name, dev->bus_id);
+       dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n",
+                       event_owner, name, dev->bus_id);
 
        if (dev->driver != &w1_slave_driver || !sl)
                return 0;
 
-       err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_FID=%02X", sl->reg_num.family);
+       err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+                       &cur_len, "W1_FID=%02X", sl->reg_num.family);
        if (err)
                return err;
 
-       err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024LX", (u64)sl->reg_num.id);
+       err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+                       &cur_len, "W1_SLAVE_ID=%024LX",
+                       (unsigned long long)sl->reg_num.id);
        if (err)
                return err;
 
        return 0;
 };
 #else
-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int w1_uevent(struct device *dev, char **envp, int num_envp,
+                       char *buffer, int buffer_size)
 {
        return 0;
 }
@@ -449,7 +458,8 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
                 (unsigned int) sl->reg_num.family,
                 (unsigned long long) sl->reg_num.id);
 
-       dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__, &sl->dev.bus_id[0]);
+       dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__,
+               &sl->dev.bus_id[0]);
 
        err = device_register(&sl->dev);
        if (err < 0) {