1 files changed, 12 insertions, 65 deletions

diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 9f308ed76cc8..bf45cf017753 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -102,14 +102,14 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      qdi_qc_issue_prot       -       command issue
+ *      qdi_qc_issue            -       command issue
  *      @qc: command pending
  *
  *      Called when the libata layer is about to issue a command. We wrap
  *      this interface so that we can load the correct ATA timings.
  */
 
-static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct ata_device *adev = qc->dev;
@@ -121,7 +121,7 @@ static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
                         outb(qdi->clock[adev->devno], qdi->timing);
                 }
         }
-        return ata_qc_issue_prot(qc);
+        return ata_sff_qc_issue(qc);
 }
 
 static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
@@ -148,79 +148,26 @@ static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
                         buflen += 4 - slop;
                 }
         } else
-                buflen = ata_data_xfer(dev, buf, buflen, rw);
+                buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
 
         return buflen;
 }
 
 static struct scsi_host_template qdi_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_PIO_SHT(DRV_NAME),
 };
 
 static struct ata_port_operations qdi6500_port_ops = {
-        .set_piomode    = qdi6500_set_piomode,
-
-        .tf_load        = ata_tf_load,
-        .tf_read        = ata_tf_read,
-        .check_status   = ata_check_status,
-        .exec_command   = ata_exec_command,
-        .dev_select     = ata_std_dev_select,
-
-        .freeze         = ata_bmdma_freeze,
-        .thaw           = ata_bmdma_thaw,
-        .error_handler  = ata_bmdma_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .inherits       = &ata_sff_port_ops,
+        .qc_issue       = qdi_qc_issue,
+        .sff_data_xfer  = qdi_data_xfer,
         .cable_detect   = ata_cable_40wire,
-
-        .qc_prep        = ata_qc_prep,
-        .qc_issue       = qdi_qc_issue_prot,
-
-        .data_xfer      = qdi_data_xfer,
-
-        .irq_clear      = ata_bmdma_irq_clear,
-        .irq_on         = ata_irq_on,
-
-        .port_start     = ata_sff_port_start,
+        .set_piomode    = qdi6500_set_piomode,
 };
 
 static struct ata_port_operations qdi6580_port_ops = {
+        .inherits       = &qdi6500_port_ops,
         .set_piomode    = qdi6580_set_piomode,
-
-        .tf_load        = ata_tf_load,
-        .tf_read        = ata_tf_read,
-        .check_status   = ata_check_status,
-        .exec_command   = ata_exec_command,
-        .dev_select     = ata_std_dev_select,
-
-        .freeze         = ata_bmdma_freeze,
-        .thaw           = ata_bmdma_thaw,
-        .error_handler  = ata_bmdma_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
-        .cable_detect   = ata_cable_40wire,
-
-        .qc_prep        = ata_qc_prep,
-        .qc_issue       = qdi_qc_issue_prot,
-
-        .data_xfer      = qdi_data_xfer,
-
-        .irq_clear      = ata_bmdma_irq_clear,
-        .irq_on         = ata_irq_on,
-
-        .port_start     = ata_sff_port_start,
 };
 
 /**
@@ -276,7 +223,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
         ap->ioaddr.cmd_addr = io_addr;
         ap->ioaddr.altstatus_addr = ctl_addr;
         ap->ioaddr.ctl_addr = ctl_addr;
-        ata_std_ports(&ap->ioaddr);
+        ata_sff_std_ports(&ap->ioaddr);
 
         ata_port_desc(ap, "cmd %lx ctl %lx", io, ctl);
 
@@ -292,7 +239,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
         printk(KERN_INFO DRV_NAME": qd%d at 0x%lx.\n", type, io);
 
         /* activate */
-        ret = ata_host_activate(host, irq, ata_interrupt, 0, &qdi_sht);
+        ret = ata_host_activate(host, irq, ata_sff_interrupt, 0, &qdi_sht);
         if (ret)
                 goto fail;