1 files changed, 8 insertions, 36 deletions

diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 95ae3ed24a9d..f3d635c0a2e9 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -200,7 +200,7 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         struct ata_ioports *ioaddr = &ap->ioaddr;
         u16 nsect, lbal, lbam, lbah, feature;
 
-        tf->command = ata_check_status(ap);
+        tf->command = ata_sff_check_status(ap);
         tf->device = readw(ioaddr->device_addr);
         feature = readw(ioaddr->error_addr);
         nsect = readw(ioaddr->nsect_addr);
@@ -243,7 +243,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap)
 
         qc = ata_qc_from_tag(ap, ap->link.active_tag);
         if (qc && likely(!(qc->tf.flags & ATA_TFLAG_POLLING)))
-                handled = ata_host_intr(ap, qc);
+                handled = ata_sff_host_intr(ap, qc);
 
         /* We received an interrupt during a polled command,
          * or some other spurious condition.  Interrupt reporting
@@ -251,7 +251,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap)
          * simply clear the interrupt
          */
         if (unlikely(!handled))
-                ata_chk_status(ap);
+                ap->ops->sff_check_status(ap);
 }
 
 /*
@@ -300,46 +300,18 @@ out:
 
 
 static struct scsi_host_template vsc_sata_sht = {
-        .module                 = THIS_MODULE,
-        .name                   = DRV_NAME,
-        .ioctl                  = ata_scsi_ioctl,
-        .queuecommand           = ata_scsi_queuecmd,
-        .can_queue              = ATA_DEF_QUEUE,
-        .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = LIBATA_MAX_PRD,
-        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
-        .emulated               = ATA_SHT_EMULATED,
-        .use_clustering         = ATA_SHT_USE_CLUSTERING,
-        .proc_name              = DRV_NAME,
-        .dma_boundary           = ATA_DMA_BOUNDARY,
-        .slave_configure        = ata_scsi_slave_config,
-        .slave_destroy          = ata_scsi_slave_destroy,
-        .bios_param             = ata_std_bios_param,
+        ATA_BMDMA_SHT(DRV_NAME),
 };
 
 
-static const struct ata_port_operations vsc_sata_ops = {
-        .tf_load                = vsc_sata_tf_load,
-        .tf_read                = vsc_sata_tf_read,
-        .exec_command           = ata_exec_command,
-        .check_status           = ata_check_status,
-        .dev_select             = ata_std_dev_select,
-        .bmdma_setup            = ata_bmdma_setup,
-        .bmdma_start            = ata_bmdma_start,
-        .bmdma_stop             = ata_bmdma_stop,
-        .bmdma_status           = ata_bmdma_status,
-        .qc_prep                = ata_qc_prep,
-        .qc_issue               = ata_qc_issue_prot,
-        .data_xfer              = ata_data_xfer,
+static struct ata_port_operations vsc_sata_ops = {
+        .inherits               = &ata_bmdma_port_ops,
+        .sff_tf_load            = vsc_sata_tf_load,
+        .sff_tf_read            = vsc_sata_tf_read,
         .freeze                 = vsc_freeze,
         .thaw                   = vsc_thaw,
-        .error_handler          = ata_bmdma_error_handler,
-        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
-        .irq_clear              = ata_bmdma_irq_clear,
-        .irq_on                 = ata_irq_on,
         .scr_read               = vsc_sata_scr_read,
         .scr_write              = vsc_sata_scr_write,
-        .port_start             = ata_port_start,
 };
 
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port,