aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2011-05-03 14:53:57 -0500
committerJens Axboe <jaxboe@fusionio.com>2011-05-06 08:23:56 -0600
commit93c46c2fa7cfb272c3014327830d6cb30d8486a4 (patch)
tree84ceb0e7bfa5726b11bd2e5596d9857be2d4bd9c /drivers/block/cciss.c
parent5afe278114a8dd9480813377c75b5e40a42c5066 (diff)
downloadkernel_samsung_smdk4412-93c46c2fa7cfb272c3014327830d6cb30d8486a4.zip
kernel_samsung_smdk4412-93c46c2fa7cfb272c3014327830d6cb30d8486a4.tar.gz
kernel_samsung_smdk4412-93c46c2fa7cfb272c3014327830d6cb30d8486a4.tar.bz2
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 23b0ba4..7990b98 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,
*/
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
@@ -4508,8 +4507,6 @@ static int cciss_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;
}