diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-07 10:32:47 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-16 22:54:09 -0400 |
commit | 6de76cfc7db8844bc26ab9a60b20f50ad7851833 (patch) | |
tree | d315fe62471ad56d618de84222fee2c97d56e73a /drivers/scsi | |
parent | 9b906779568f009b53254a15b283b53ae4570b93 (diff) |
[SCSI] aacraid: semaphore cleanup
Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: aacraid@adaptec.com
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/commsup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 1a5bf5724750..645ddd9d9b9e 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c | |||
@@ -190,7 +190,7 @@ static int open_getadapter_fib(struct aac_dev * dev, void __user *arg) | |||
190 | /* | 190 | /* |
191 | * Initialize the mutex used to wait for the next AIF. | 191 | * Initialize the mutex used to wait for the next AIF. |
192 | */ | 192 | */ |
193 | init_MUTEX_LOCKED(&fibctx->wait_sem); | 193 | sema_init(&fibctx->wait_sem, 0); |
194 | fibctx->wait = 0; | 194 | fibctx->wait = 0; |
195 | /* | 195 | /* |
196 | * Initialize the fibs and set the count of fibs on | 196 | * Initialize the fibs and set the count of fibs on |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 70079146e203..afc9aeba5edb 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -124,7 +124,7 @@ int aac_fib_setup(struct aac_dev * dev) | |||
124 | fibptr->hw_fib_va = hw_fib; | 124 | fibptr->hw_fib_va = hw_fib; |
125 | fibptr->data = (void *) fibptr->hw_fib_va->data; | 125 | fibptr->data = (void *) fibptr->hw_fib_va->data; |
126 | fibptr->next = fibptr+1; /* Forward chain the fibs */ | 126 | fibptr->next = fibptr+1; /* Forward chain the fibs */ |
127 | init_MUTEX_LOCKED(&fibptr->event_wait); | 127 | sema_init(&fibptr->event_wait, 0); |
128 | spin_lock_init(&fibptr->event_lock); | 128 | spin_lock_init(&fibptr->event_lock); |
129 | hw_fib->header.XferState = cpu_to_le32(0xffffffff); | 129 | hw_fib->header.XferState = cpu_to_le32(0xffffffff); |
130 | hw_fib->header.SenderSize = cpu_to_le16(dev->max_fib_size); | 130 | hw_fib->header.SenderSize = cpu_to_le16(dev->max_fib_size); |