[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, 5 insertions, 4 deletions

diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index a07e6e525173..809d337ed641 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -107,7 +107,6 @@ static const struct ata_port_operations sis_ops = {
         .check_status           = ata_check_status,
         .exec_command           = ata_exec_command,
         .dev_select             = ata_std_dev_select,
-        .phy_reset              = sata_phy_reset,
         .bmdma_setup            = ata_bmdma_setup,
         .bmdma_start            = ata_bmdma_start,
         .bmdma_stop             = ata_bmdma_stop,
@@ -115,7 +114,10 @@ static const struct ata_port_operations sis_ops = {
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
         .data_xfer              = ata_pio_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               = sis_scr_read,
@@ -127,8 +129,7 @@ static const struct ata_port_operations sis_ops = {
 
 static struct ata_port_info sis_port_info = {
         .sht            = &sis_sht,
-        .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |
-                          ATA_FLAG_NO_LEGACY,
+        .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
         .pio_mask       = 0x1f,
         .mwdma_mask     = 0x7,
         .udma_mask      = 0x7f,