linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 357a2e0..c3f67ea 100644 (file)
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -22,15 +22,23 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/delay.h>
-#include <linux/kthread.h>
 
 #include "w1.h"
 #include "w1_log.h"
 #include "w1_netlink.h"
-#include "w1_int.h"
 
 static u32 w1_ids = 1;
 
+extern struct device_driver w1_master_driver;
+extern struct bus_type w1_bus_type;
+extern struct device w1_master_device;
+extern int w1_max_slave_count;
+extern int w1_max_slave_ttl;
+extern struct list_head w1_masters;
+extern spinlock_t w1_mlock;
+
+extern int w1_process(void *);
+
 static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
                                       struct device_driver *driver,
                                       struct device *device)
@@ -57,6 +65,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
        dev->max_slave_count    = slave_count;
        dev->slave_count        = 0;
        dev->attempts           = 0;
+       dev->kpid               = -1;
        dev->initialized        = 0;
        dev->id                 = id;
        dev->slave_ttl          = slave_ttl;
@@ -65,7 +74,9 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
        atomic_set(&dev->refcnt, 2);
 
        INIT_LIST_HEAD(&dev->slist);
-       mutex_init(&dev->mutex);
+       init_MUTEX(&dev->mutex);
+
+       init_completion(&dev->dev_exited);
 
        memcpy(&dev->dev, device, sizeof(struct device));
        snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
@@ -74,11 +85,16 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
 
        dev->driver = driver;
 
+       dev->groups = 1;
        dev->seq = 1;
+       dev_init_netlink(dev);
 
        err = device_register(&dev->dev);
        if (err) {
                printk(KERN_ERR "Failed to register master device. err=%d\n", err);
+
+               dev_fini_netlink(dev);
+
                memset(dev, 0, sizeof(struct w1_master));
                kfree(dev);
                dev = NULL;
@@ -87,7 +103,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
        return dev;
 }
 
-static void w1_free_dev(struct w1_master *dev)
+void w1_free_dev(struct w1_master *dev)
 {
        device_unregister(&dev->dev);
 }
@@ -109,12 +125,12 @@ int w1_add_master_device(struct w1_bus_master *master)
        if (!dev)
                return -ENOMEM;
 
-       dev->thread = kthread_run(&w1_process, dev, "%s", dev->name);
-       if (IS_ERR(dev->thread)) {
-               retval = PTR_ERR(dev->thread);
+       dev->kpid = kernel_thread(&w1_process, dev, 0);
+       if (dev->kpid < 0) {
                dev_err(&dev->dev,
                         "Failed to create new kernel thread. err=%d\n",
-                        retval);
+                        dev->kpid);
+               retval = dev->kpid;
                goto err_out_free_dev;
        }
 
@@ -126,19 +142,25 @@ int w1_add_master_device(struct w1_bus_master *master)
 
        dev->initialized = 1;
 
-       mutex_lock(&w1_mlock);
+       spin_lock(&w1_mlock);
        list_add(&dev->w1_master_entry, &w1_masters);
-       mutex_unlock(&w1_mlock);
+       spin_unlock(&w1_mlock);
 
-       memset(&msg, 0, sizeof(msg));
        msg.id.mst.id = dev->id;
+       msg.id.mst.pid = dev->kpid;
        msg.type = W1_MASTER_ADD;
        w1_netlink_send(dev, &msg);
 
        return 0;
 
 err_out_kill_thread:
-       kthread_stop(dev->thread);
+       set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
+       if (kill_proc(dev->kpid, SIGTERM, 1))
+               dev_err(&dev->dev,
+                        "Failed to send signal to w1 kernel thread %d.\n",
+                        dev->kpid);
+       wait_for_completion(&dev->dev_exited);
+
 err_out_free_dev:
        w1_free_dev(dev);
 
@@ -147,21 +169,26 @@ err_out_free_dev:
 
 void __w1_remove_master_device(struct w1_master *dev)
 {
+       int err;
        struct w1_netlink_msg msg;
 
        set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
-       kthread_stop(dev->thread);
+       err = kill_proc(dev->kpid, SIGTERM, 1);
+       if (err)
+               dev_err(&dev->dev,
+                        "%s: Failed to send signal to w1 kernel thread %d.\n",
+                        __func__, dev->kpid);
 
        while (atomic_read(&dev->refcnt)) {
-               dev_info(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n",
+               dev_dbg(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n",
                                dev->name, atomic_read(&dev->refcnt));
 
                if (msleep_interruptible(1000))
                        flush_signals(current);
        }
 
-       memset(&msg, 0, sizeof(msg));
        msg.id.mst.id = dev->id;
+       msg.id.mst.pid = dev->kpid;
        msg.type = W1_MASTER_REMOVE;
        w1_netlink_send(dev, &msg);
 
@@ -190,3 +217,5 @@ void w1_remove_master_device(struct w1_bus_master *bm)
 
 EXPORT_SYMBOL(w1_add_master_device);
 EXPORT_SYMBOL(w1_remove_master_device);
+
+MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_W1);