[PATCH] W1: u64 is not long long

[linux-2.6] / drivers / w1 / w1.c

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 1b6b74c116a911c3f34c34ad86357cfe3a948dc5..d640c1e1f8cdc77dac3ac23dd86547a338710b3c 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -77,8 +77,7 @@ static void w1_master_release(struct device *dev)
 
        dev_dbg(dev, "%s: Releasing %s.\n", __func__, md->name);
 
-       if (md->nls && md->nls->sk_socket)
-               sock_release(md->nls->sk_socket);
+       dev_fini_netlink(md);
        memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
        kfree(md);
 }
@@ -143,12 +142,12 @@ static struct bin_attribute w1_slave_attr_bin_id = {
 /* Default family */
 static struct w1_family w1_default_family;
 
-static int w1_hotplug(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);
 
 static struct bus_type w1_bus_type = {
        .name = "w1",
        .match = w1_master_match,
-       .hotplug = w1_hotplug,
+       .uevent = w1_uevent,
 };
 
 struct device_driver w1_master_driver = {
@@ -165,11 +164,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,
@@ -177,6 +177,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)
 {
@@ -356,13 +357,13 @@ 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_hotplug(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;
@@ -378,7 +379,7 @@ static int w1_hotplug(struct device *dev, char **envp, int num_envp, char *buffe
                event_owner = "slave";
                name = sl->name;
        } else {
-               dev_dbg(dev, "Unknown hotplug event.\n");
+               dev_dbg(dev, "Unknown event.\n");
                return -EINVAL;
        }
 
@@ -387,18 +388,21 @@ static int w1_hotplug(struct device *dev, char **envp, int num_envp, char *buffe
        if (dev->driver != &w1_slave_driver || !sl)
                return 0;
 
-       err = add_hotplug_env_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_hotplug_env_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_hotplug(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;
 }
@@ -553,7 +557,7 @@ static void w1_slave_detach(struct w1_slave *sl)
        kfree(sl);
 }
 
-static struct w1_master *w1_search_master(unsigned long data)
+static struct w1_master *w1_search_master(void *data)
 {
        struct w1_master *dev;
        int found = 0;
@@ -584,7 +588,7 @@ void w1_reconnect_slaves(struct w1_family *f)
        spin_unlock_bh(&w1_mlock);
 }
 
-static void w1_slave_found(unsigned long data, u64 rn)
+static void w1_slave_found(void *data, u64 rn)
 {
        int slave_count;
        struct w1_slave *sl;
@@ -596,8 +600,8 @@ static void w1_slave_found(unsigned long data, u64 rn)
 
        dev = w1_search_master(data);
        if (!dev) {
-               printk(KERN_ERR "Failed to find w1 master device for data %08lx, it is impossible.\n",
-                               data);
+               printk(KERN_ERR "Failed to find w1 master device for data %p, "
+                      "it is impossible.\n", data);
                return;
        }