diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-05-03 21:59:56 +0200 |
|---|---|---|
| committer | James Bottomley <jbottomley@parallels.com> | 2011-05-17 09:07:50 +0200 |
| commit | dfc2224828c5fc4ec7e11587b9d6b97283aa2d01 (patch) | |
| tree | ff4856f75e28dd4b59a4d8b60b53a564538afc30 /drivers/scsi/hpsa.c | |
| parent | [SCSI] hpsa: do soft reset if hard reset is broken (diff) | |
| download | linux-dfc2224828c5fc4ec7e11587b9d6b97283aa2d01.tar.xz linux-dfc2224828c5fc4ec7e11587b9d6b97283aa2d01.zip | |
[SCSI] hpsa: remove superfluous sleeps around reset code
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <jbottomley@parallels.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 6fe77d0575ca..ca8ee9220db0 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3217,7 +3217,6 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, */ dev_info(&pdev->dev, "using doorbell to reset controller\n"); writel(use_doorbell, vaddr + SA5_DOORBELL); - msleep(1000); } else { /* Try to do it the PCI power state way */ /* Quoting from the Open CISS Specification: "The Power @@ -3248,8 +3247,6 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, pmcsr &= ~PCI_PM_CTRL_STATE_MASK; pmcsr |= PCI_D0; pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); - - msleep(500); } return 0; } |