From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Date: Tue, 3 May 2011 19:53:57 +0000 (-0500)
Subject: cciss: remove superfluous sleeps around reset code
X-Git-Tag: v3.0-rc1~162^2~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=93c46c2fa7cfb272c3014327830d6cb30d8486a4;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 23b0ba49300..7990b98d4f7 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;
 }