Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93c46c2f authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: remove superfluous sleeps around reset code 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 5afe2781

drivers/block/cciss.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

}