Merge commit 'v2.6.27-rc6' into x86/pat

[linux-2.6-omap-h63xx.git] / drivers / usb / atm / usbatm.c

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 11e9b15ca45a35fb7c37e84fef91e07c54b2b507..07228721cafebda10100d3a1631d16473a8a6760 100644 (file)
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -80,6 +80,7 @@
 #include <linux/stat.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
+#include <linux/kthread.h>
 
 #ifdef VERBOSE_DEBUG
 static int usbatm_print_packet(const unsigned char *data, int len);
@@ -257,9 +258,10 @@ static void usbatm_complete(struct urb *urb)
 {
        struct usbatm_channel *channel = urb->context;
        unsigned long flags;
+       int status = urb->status;
 
        vdbg("%s: urb 0x%p, status %d, actual_length %d",
-            __func__, urb, urb->status, urb->actual_length);
+            __func__, urb, status, urb->actual_length);
 
        /* usually in_interrupt(), but not always */
        spin_lock_irqsave(&channel->lock, flags);
@@ -269,16 +271,16 @@ static void usbatm_complete(struct urb *urb)
 
        spin_unlock_irqrestore(&channel->lock, flags);
 
-       if (unlikely(urb->status) &&
+       if (unlikely(status) &&
                        (!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||
-                        urb->status != -EILSEQ ))
+                        status != -EILSEQ ))
        {
-               if (urb->status == -ESHUTDOWN)
+               if (status == -ESHUTDOWN)
                        return;
 
                if (printk_ratelimit())
                        atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",
-                               __func__, urb, urb->status);
+                               __func__, urb, status);
                /* throttle processing in case of an error */
                mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));
        } else
@@ -1013,10 +1015,7 @@ static int usbatm_do_heavy_init(void *arg)
        struct usbatm_data *instance = arg;
        int ret;
 
-       daemonize(instance->driver->driver_name);
        allow_signal(SIGTERM);
-       instance->thread_pid = current->pid;
-
        complete(&instance->thread_started);
 
        ret = instance->driver->heavy_init(instance, instance->usb_intf);
@@ -1025,7 +1024,7 @@ static int usbatm_do_heavy_init(void *arg)
                ret = usbatm_atm_init(instance);
 
        mutex_lock(&instance->serialize);
-       instance->thread_pid = -1;
+       instance->thread = NULL;
        mutex_unlock(&instance->serialize);
 
        complete_and_exit(&instance->thread_exited, ret);
@@ -1033,13 +1032,18 @@ static int usbatm_do_heavy_init(void *arg)
 
 static int usbatm_heavy_init(struct usbatm_data *instance)
 {
-       int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_FS | CLONE_FILES);
-
-       if (ret < 0) {
-               usb_err(instance, "%s: failed to create kernel_thread (%d)!\n", __func__, ret);
-               return ret;
+       struct task_struct *t;
+
+       t = kthread_create(usbatm_do_heavy_init, instance,
+                       instance->driver->driver_name);
+       if (IS_ERR(t)) {
+               usb_err(instance, "%s: failed to create kernel_thread (%ld)!\n",
+                               __func__, PTR_ERR(t));
+               return PTR_ERR(t);
        }
 
+       instance->thread = t;
+       wake_up_process(t);
        wait_for_completion(&instance->thread_started);
 
        return 0;
@@ -1123,7 +1127,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
        kref_init(&instance->refcount);         /* dropped in usbatm_usb_disconnect */
        mutex_init(&instance->serialize);
 
-       instance->thread_pid = -1;
+       instance->thread = NULL;
        init_completion(&instance->thread_started);
        init_completion(&instance->thread_exited);
 
@@ -1286,8 +1290,8 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
 
        mutex_lock(&instance->serialize);
        instance->disconnected = 1;
-       if (instance->thread_pid >= 0)
-               kill_proc(instance->thread_pid, SIGTERM, 1);
+       if (instance->thread != NULL)
+               send_sig(SIGTERM, instance->thread, 1);
        mutex_unlock(&instance->serialize);
 
        wait_for_completion(&instance->thread_exited);