aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2011-05-03 15:53:57 -0400
committerJens Axboe <jaxboe@fusionio.com>2011-05-06 10:23:56 -0400
commit93c46c2fa7cfb272c3014327830d6cb30d8486a4 (patch)
tree84ceb0e7bfa5726b11bd2e5596d9857be2d4bd9c /drivers/block/cciss.c
parent5afe278114a8dd9480813377c75b5e40a42c5066 (diff)
cciss: remove superfluous sleeps around reset code
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 23b0ba49300a..7990b98d4f73 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4477,7 +4477,6 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
4477 */ 4477 */
4478 dev_info(&pdev->dev, "using doorbell to reset controller\n"); 4478 dev_info(&pdev->dev, "using doorbell to reset controller\n");
4479 writel(use_doorbell, vaddr + SA5_DOORBELL); 4479 writel(use_doorbell, vaddr + SA5_DOORBELL);
4480 msleep(1000);
4481 } else { /* Try to do it the PCI power state way */ 4480 } else { /* Try to do it the PCI power state way */
4482 4481
4483 /* Quoting from the Open CISS Specification: "The Power 4482 /* Quoting from the Open CISS Specification: "The Power
@@ -4508,8 +4507,6 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
4508 pmcsr &= ~PCI_PM_CTRL_STATE_MASK; 4507 pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
4509 pmcsr |= PCI_D0; 4508 pmcsr |= PCI_D0;
4510 pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); 4509 pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
4511
4512 msleep(500);
4513 } 4510 }
4514 return 0; 4511 return 0;
4515} 4512}