diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-07 14:32:47 +0000 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-16 22:54:09 -0400 |
| commit | 6de76cfc7db8844bc26ab9a60b20f50ad7851833 (patch) | |
| tree | d315fe62471ad56d618de84222fee2c97d56e73a | |
| parent | 9b906779568f009b53254a15b283b53ae4570b93 (diff) | |
| download | op-kernel-dev-6de76cfc7db8844bc26ab9a60b20f50ad7851833.zip op-kernel-dev-6de76cfc7db8844bc26ab9a60b20f50ad7851833.tar.gz | |
[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>
| -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 1a5bf57..645ddd9 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) /* * Initialize the mutex used to wait for the next AIF. */ - init_MUTEX_LOCKED(&fibctx->wait_sem); + sema_init(&fibctx->wait_sem, 0); fibctx->wait = 0; /* * 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 7007914..afc9aeb 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) fibptr->hw_fib_va = hw_fib; fibptr->data = (void *) fibptr->hw_fib_va->data; fibptr->next = fibptr+1; /* Forward chain the fibs */ - init_MUTEX_LOCKED(&fibptr->event_wait); + sema_init(&fibptr->event_wait, 0); spin_lock_init(&fibptr->event_lock); hw_fib->header.XferState = cpu_to_le32(0xffffffff); hw_fib->header.SenderSize = cpu_to_le16(dev->max_fib_size); |
