[PATCH] sata_sil24: don't do hardreset during driver initialization

There's no need to perform hardreset during driver initialization.
It's already done during host reset and even if the controller is in
some wacky state, we now have proper hardreset to back us up.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 4180c81f639cf779b2fdcdb0f382145789f81bdc..a8328a88e8c9fc4c023c92f5badaebd910669429 100644 (file)
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -1069,11 +1069,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
                /* Clear port multiplier enable and resume bits */
                writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR);
-
-               /* Reset itself */
-               if (__sil24_reset_controller(port))
-                       dev_printk(KERN_ERR, &pdev->dev,
-                                  "failed to reset controller\n");
        }
 
        /* Turn on interrupts */