projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5afe278
)
cciss: remove superfluous sleeps around reset code
author
Stephen M. Cameron
<scameron@beardog.cce.hp.com>
Tue, 3 May 2011 19:53:57 +0000
(14:53 -0500)
committer
Jens Axboe
<jaxboe@fusionio.com>
Fri, 6 May 2011 14:23:56 +0000
(08:23 -0600)
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/block/cciss.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/block/cciss.c
b/drivers/block/cciss.c
index 23b0ba49300a054defe0a4a913c6769a87b87683..7990b98d4f735d6b4fb11f8b203e0dfa9a5914e8 100644
(file)
--- 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;
}