Commit dfc22248 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[SCSI] hpsa: remove superfluous sleeps around reset code 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 64670ac8

drivers/scsi/hpsa.c

+0 −3
Original line number Diff line number Diff line
@@ -3217,7 +3217,6 @@ static int hpsa_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
@@ -3248,8 +3247,6 @@ static int hpsa_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;

}