aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptsas.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-13 12:27:11 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2006-01-14 11:54:57 -0500
commiteeb846cefdd842af479393a7d0fd399a29e42532 (patch)
treeee8ec36c7ce0c259b52de7b4185013082b061d14 /drivers/message/fusion/mptsas.c
parent9a28f49adbe4955af8a1306fd36ddae15136dde7 (diff)
[SCSI] fusion: convert semaphores to mutexes
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptsas.c')
-rw-r--r--drivers/message/fusion/mptsas.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index b2c682fe634f..19fc03ecdf60 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -457,7 +457,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
457 if (phy->identify.target_port_protocols & SAS_PROTOCOL_SMP) 457 if (phy->identify.target_port_protocols & SAS_PROTOCOL_SMP)
458 return -ENXIO; 458 return -ENXIO;
459 459
460 if (down_interruptible(&ioc->sas_mgmt.mutex)) 460 if (mutex_lock_interruptible(&ioc->sas_mgmt.mutex))
461 goto out; 461 goto out;
462 462
463 mf = mpt_get_msg_frame(mptsasMgmtCtx, ioc); 463 mf = mpt_get_msg_frame(mptsasMgmtCtx, ioc);
@@ -508,7 +508,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
508 error = 0; 508 error = 0;
509 509
510 out_unlock: 510 out_unlock:
511 up(&ioc->sas_mgmt.mutex); 511 mutex_unlock(&ioc->sas_mgmt.mutex);
512 out: 512 out:
513 return error; 513 return error;
514} 514}
@@ -1477,7 +1477,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1477 INIT_LIST_HEAD(&ioc->sas_topology); 1477 INIT_LIST_HEAD(&ioc->sas_topology);
1478 mutex_init(&ioc->sas_topology_mutex); 1478 mutex_init(&ioc->sas_topology_mutex);
1479 1479
1480 init_MUTEX(&ioc->sas_mgmt.mutex); 1480 mutex_init(&ioc->sas_mgmt.mutex);
1481 init_completion(&ioc->sas_mgmt.done); 1481 init_completion(&ioc->sas_mgmt.done);
1482 1482
1483 /* Verify that we won't exceed the maximum 1483 /* Verify that we won't exceed the maximum