scsi: aacraid: change wait_sem to a completion

The wait_sem member is used like a completion, so we should
use the respective API. The behavior is unchanged.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 39eb415987fc9fd901ba9ee157dedfcf76910829..531a0b9a58f8010cce632bdf870ff96e47b23e20 100644 (file)
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1241,7 +1241,7 @@ struct aac_fib_context {
        u32                     unique;         // unique value representing this context
        ulong                   jiffies;        // used for cleanup - dmb changed to ulong
        struct list_head        next;           // used to link context's into a linked list
-       struct semaphore        wait_sem;       // this is used to wait for the next fib to arrive.
+       struct completion       completion;     // this is used to wait for the next fib to arrive.
        int                     wait;           // Set to true when thread is in WaitForSingleObject
        unsigned long           count;          // total number of FIBs on FibList
        struct list_head        fib_list;       // this holds fibs and their attachd hw_fibs

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 25f6600d6c090c45e9dfb6c7aabaadc7ffa72662..6a6ad94777866725b6da932947dc9d87bce79707 100644 (file)
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -203,7 +203,7 @@ static int open_getadapter_fib(struct aac_dev * dev, void __user *arg)
                /*
                 *      Initialize the mutex used to wait for the next AIF.
                 */
-               sema_init(&fibctx->wait_sem, 0);
+               init_completion(&fibctx->completion);
                fibctx->wait = 0;
                /*
                 *      Initialize the fibs and set the count of fibs on
@@ -335,7 +335,7 @@ return_fib:
                        ssleep(1);
                }
                if (f.wait) {
-                       if(down_interruptible(&fibctx->wait_sem) < 0) {
+                       if (wait_for_completion_interruptible(&fibctx->completion) < 0) {
                                status = -ERESTARTSYS;
                        } else {
                                /* Lock again and retry */

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1e77d96a18f27900d32a7e57cb58f31f9abbd932..7ed51a77e39d2e8f4b4cdd8f1751b93d135f964c 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1828,7 +1828,7 @@ int aac_check_health(struct aac_dev * aac)
                         * Set the event to wake up the
                         * thread that will waiting.
                         */
-                       up(&fibctx->wait_sem);
+                       complete(&fibctx->completion);
                } else {
                        printk(KERN_WARNING "aifd: didn't allocate NewFib.\n");
                        kfree(fib);
@@ -2165,7 +2165,7 @@ static void wakeup_fibctx_threads(struct aac_dev *dev,
                 * Set the event to wake up the
                 * thread that is waiting.
                 */
-               up(&fibctx->wait_sem);
+               complete(&fibctx->completion);
 
                entry = entry->next;
        }