[PATCH] libata: convert several bmdma-style controllers to new EH, take #3

Convert sata_sis, svw, uli and vsc drivers to new EH.  All the drivers
used to specify ATA_FLAG_SATA_RESET to tell libata to use SATA
hardreset instead of SRST.  This patch makes all the converted drivers
use the standard bmdma error handler which uses both SRST and SATA
hardreset.

All the controllers should be able to perform SRST but still needs
verification.  If some of the controllers can't do SRST, it will be
very easy to spot as it will show up during boot probing.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index d9b516836486..c94b870cf378 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -314,7 +314,6 @@ static const struct ata_port_operations k2_sata_ops = {
         .check_status           = k2_stat_check_status,
         .exec_command           = ata_exec_command,
         .dev_select             = ata_std_dev_select,
-        .phy_reset              = sata_phy_reset,
         .bmdma_setup            = k2_bmdma_setup_mmio,
         .bmdma_start            = k2_bmdma_start_mmio,
         .bmdma_stop             = ata_bmdma_stop,
@@ -322,7 +321,10 @@ static const struct ata_port_operations k2_sata_ops = {
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
         .data_xfer              = ata_mmio_data_xfer,
-        .eng_timeout            = ata_eng_timeout,
+        .freeze                 = ata_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+        .error_handler          = ata_bmdma_error_handler,
+        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .scr_read               = k2_sata_scr_read,
@@ -422,8 +424,8 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);
 
         probe_ent->sht = &k2_sata_sht;
-        probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |
-                                ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
+        probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                ATA_FLAG_MMIO;
         probe_ent->port_ops = &k2_sata_ops;
         probe_ent->n_ports = 4;
         probe_ent->irq = pdev->irq;