mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
[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>
This commit is contained in:
parent
64670ac870
commit
dfc2224828
1 changed files with 0 additions and 3 deletions
|
@ -3217,7 +3217,6 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
|
||||||
*/
|
*/
|
||||||
dev_info(&pdev->dev, "using doorbell to reset controller\n");
|
dev_info(&pdev->dev, "using doorbell to reset controller\n");
|
||||||
writel(use_doorbell, vaddr + SA5_DOORBELL);
|
writel(use_doorbell, vaddr + SA5_DOORBELL);
|
||||||
msleep(1000);
|
|
||||||
} else { /* Try to do it the PCI power state way */
|
} else { /* Try to do it the PCI power state way */
|
||||||
|
|
||||||
/* Quoting from the Open CISS Specification: "The Power
|
/* 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_PM_CTRL_STATE_MASK;
|
||||||
pmcsr |= PCI_D0;
|
pmcsr |= PCI_D0;
|
||||||
pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
|
pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
|
||||||
|
|
||||||
msleep(500);
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue