diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-01-11 07:16:10 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2006-01-12 12:53:11 -0500 |
commit | 0b9506723826c68b50fa33e345700ddcac1bed36 (patch) | |
tree | da3e432ef4517c47ebdc088c6322d0ac51193127 /drivers/scsi/megaraid.c | |
parent | dacee84b070c4e705a5b6446f1f0a6a6e2f8d7a4 (diff) |
[SCSI] turn most scsi semaphores into mutexes
the scsi layer is using semaphores in a mutex way, this patch converts
these into using mutexes instead
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r-- | drivers/scsi/megaraid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 4a6feb1e5e3d..d101a8a6f4e8 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -4479,7 +4479,7 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) | |||
4479 | * serialized. This is so because we want to reserve maximum number of | 4479 | * serialized. This is so because we want to reserve maximum number of |
4480 | * available command ids for the I/O commands. | 4480 | * available command ids for the I/O commands. |
4481 | */ | 4481 | */ |
4482 | down(&adapter->int_mtx); | 4482 | mutex_lock(&adapter->int_mtx); |
4483 | 4483 | ||
4484 | scb = &adapter->int_scb; | 4484 | scb = &adapter->int_scb; |
4485 | memset(scb, 0, sizeof(scb_t)); | 4485 | memset(scb, 0, sizeof(scb_t)); |
@@ -4527,7 +4527,7 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) | |||
4527 | mc->cmd, mc->opcode, mc->subopcode, scmd->result); | 4527 | mc->cmd, mc->opcode, mc->subopcode, scmd->result); |
4528 | } | 4528 | } |
4529 | 4529 | ||
4530 | up(&adapter->int_mtx); | 4530 | mutex_unlock(&adapter->int_mtx); |
4531 | 4531 | ||
4532 | return rval; | 4532 | return rval; |
4533 | } | 4533 | } |
@@ -4866,7 +4866,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
4866 | adapter->has_64bit_addr = 0; | 4866 | adapter->has_64bit_addr = 0; |
4867 | } | 4867 | } |
4868 | 4868 | ||
4869 | init_MUTEX(&adapter->int_mtx); | 4869 | mutex_init(&adapter->int_mtx); |
4870 | init_completion(&adapter->int_waitq); | 4870 | init_completion(&adapter->int_waitq); |
4871 | 4871 | ||
4872 | adapter->this_id = DEFAULT_INITIATOR_ID; | 4872 | adapter->this_id = DEFAULT_INITIATOR_ID; |