4 files changed, 13 insertions, 21 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 2d430b7e8cf4..9ce7002bd070 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -997,7 +997,7 @@ struct aac_dev
         int                     maximum_num_physicals;
         int                     maximum_num_channels;
         struct fsa_dev_info     *fsa_dev;
-        pid_t                   thread_pid;
+        struct task_struct      *thread;
         int                     cardtype;
         
         /*
@@ -1017,7 +1017,6 @@ struct aac_dev
          *      AIF thread states
          */
         u32                     aif_thread;
-        struct completion       aif_completion;
         struct aac_adapter_info adapter_info;
         struct aac_supplement_adapter_info supplement_adapter_info;
         /* These are in adapter info but they are in the io flow so
@@ -1797,7 +1796,7 @@ int aac_sa_init(struct aac_dev *dev);
 unsigned int aac_response_normal(struct aac_queue * q);
 unsigned int aac_command_normal(struct aac_queue * q);
 unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index);
-int aac_command_thread(struct aac_dev * dev);
+int aac_command_thread(void *data);
 int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx);
 int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size);
 struct aac_driver_ident* aac_get_driver_ident(int devtype);
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 1628d094943d..19397453bae7 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -433,7 +433,6 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         }
                 
         INIT_LIST_HEAD(&dev->fib_list);
-        init_completion(&dev->aif_completion);
 
         return dev;
 }
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 609fd19b1844..c7f80ec7abde 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -39,6 +39,7 @@
 #include <linux/completion.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/kthread.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <asm/semaphore.h>
@@ -1045,8 +1046,9 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
  *      more FIBs.
  */
  
-int aac_command_thread(struct aac_dev * dev)
+int aac_command_thread(void *data)
 {
+        struct aac_dev *dev = data;
         struct hw_fib *hw_fib, *hw_newfib;
         struct fib *fib, *newfib;
         struct aac_fib_context *fibctx;
@@ -1058,12 +1060,7 @@ int aac_command_thread(struct aac_dev * dev)
          */
         if (dev->aif_thread)
                 return -EINVAL;
-        /*
-         *      Set up the name that will appear in 'ps'
-         *      stored in  task_struct.comm[16].
-         */
-        daemonize("aacraid");
-        allow_signal(SIGKILL);
+
         /*
          *      Let the DPC know it has a place to send the AIF's to.
          */
@@ -1266,13 +1263,12 @@ int aac_command_thread(struct aac_dev * dev)
                 spin_unlock_irqrestore(dev->queues->queue[HostNormCmdQueue].lock, flags);
                 schedule();
 
-                if(signal_pending(current))
+                if (kthread_should_stop())
                         break;
                 set_current_state(TASK_INTERRUPTIBLE);
         }
         if (dev->queues)
                 remove_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait);
         dev->aif_thread = 0;
-        complete_and_exit(&dev->aif_completion, 0);
         return 0;
 }
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 271617890562..c2596335549d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -48,6 +48,7 @@
 #include <linux/syscalls.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
+#include <linux/kthread.h>
 #include <asm/semaphore.h>
 
 #include <scsi/scsi.h>
@@ -850,10 +851,10 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         /*
          *      Start any kernel threads needed
          */
-        aac->thread_pid = kernel_thread((int (*)(void *))aac_command_thread,
-          aac, 0);
-        if (aac->thread_pid < 0) {
+        aac->thread = kthread_run(aac_command_thread, aac, AAC_DRIVERNAME);
+        if (IS_ERR(aac->thread)) {
                 printk(KERN_ERR "aacraid: Unable to create command thread.\n");
+                error = PTR_ERR(aac->thread);
                 goto out_deinit;
         }
 
@@ -934,9 +935,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         return 0;
 
  out_deinit:
-        kill_proc(aac->thread_pid, SIGKILL, 0);
-        wait_for_completion(&aac->aif_completion);
-
+        kthread_stop(aac->thread);
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
         free_irq(pdev->irq, aac);
@@ -970,8 +969,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
 
         scsi_remove_host(shost);
 
-        kill_proc(aac->thread_pid, SIGKILL, 0);
-        wait_for_completion(&aac->aif_completion);
+        kthread_stop(aac->thread);
 
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);