1 files changed, 14 insertions, 66 deletions

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 8e1b7e9c0ae4..be53545c9f64 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -131,56 +131,33 @@ struct adma_port_priv {
 static int adma_ata_init_one(struct pci_dev *pdev,
                                 const struct pci_device_id *ent);
 static int adma_port_start(struct ata_port *ap);
-static void adma_host_stop(struct ata_host *host);
 static void adma_port_stop(struct ata_port *ap);
 static void adma_qc_prep(struct ata_queued_cmd *qc);
 static unsigned int adma_qc_issue(struct ata_queued_cmd *qc);
 static int adma_check_atapi_dma(struct ata_queued_cmd *qc);
-static void adma_bmdma_stop(struct ata_queued_cmd *qc);
-static u8 adma_bmdma_status(struct ata_port *ap);
-static void adma_irq_clear(struct ata_port *ap);
 static void adma_freeze(struct ata_port *ap);
 static void adma_thaw(struct ata_port *ap);
-static void adma_error_handler(struct ata_port *ap);
+static int adma_prereset(struct ata_link *link, unsigned long deadline);
 
 static struct scsi_host_template adma_ata_sht = {
-        .module                 = THIS_MODULE,
-        .name                   = DRV_NAME,
-        .ioctl                  = ata_scsi_ioctl,
-        .queuecommand           = ata_scsi_queuecmd,
-        .slave_configure        = ata_scsi_slave_config,
-        .slave_destroy          = ata_scsi_slave_destroy,
-        .bios_param             = ata_std_bios_param,
-        .proc_name              = DRV_NAME,
-        .can_queue              = ATA_DEF_QUEUE,
-        .this_id                = ATA_SHT_THIS_ID,
+        ATA_BASE_SHT(DRV_NAME),
         .sg_tablesize           = LIBATA_MAX_PRD,
         .dma_boundary           = ADMA_DMA_BOUNDARY,
-        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
-        .use_clustering         = ENABLE_CLUSTERING,
-        .emulated               = ATA_SHT_EMULATED,
 };
 
-static const struct ata_port_operations adma_ata_ops = {
-        .tf_load                = ata_tf_load,
-        .tf_read                = ata_tf_read,
-        .exec_command           = ata_exec_command,
-        .check_status           = ata_check_status,
-        .dev_select             = ata_std_dev_select,
+static struct ata_port_operations adma_ata_ops = {
+        .inherits               = &ata_sff_port_ops,
+
         .check_atapi_dma        = adma_check_atapi_dma,
-        .data_xfer              = ata_data_xfer,
         .qc_prep                = adma_qc_prep,
         .qc_issue               = adma_qc_issue,
+
         .freeze                 = adma_freeze,
         .thaw                   = adma_thaw,
-        .error_handler          = adma_error_handler,
-        .irq_clear              = adma_irq_clear,
-        .irq_on                 = ata_irq_on,
+        .prereset               = adma_prereset,
+
         .port_start             = adma_port_start,
         .port_stop              = adma_port_stop,
-        .host_stop              = adma_host_stop,
-        .bmdma_stop             = adma_bmdma_stop,
-        .bmdma_status           = adma_bmdma_status,
 };
 
 static struct ata_port_info adma_port_info[] = {
@@ -213,21 +190,6 @@ static int adma_check_atapi_dma(struct ata_queued_cmd *qc)
         return 1;       /* ATAPI DMA not yet supported */
 }
 
-static void adma_bmdma_stop(struct ata_queued_cmd *qc)
-{
-        /* nothing */
-}
-
-static u8 adma_bmdma_status(struct ata_port *ap)
-{
-        return 0;
-}
-
-static void adma_irq_clear(struct ata_port *ap)
-{
-        /* nothing */
-}
-
 static void adma_reset_engine(struct ata_port *ap)
 {
         void __iomem *chan = ADMA_PORT_REGS(ap);
@@ -246,7 +208,7 @@ static void adma_reinit_engine(struct ata_port *ap)
 
         /* mask/clear ATA interrupts */
         writeb(ATA_NIEN, ap->ioaddr.ctl_addr);
-        ata_check_status(ap);
+        ata_sff_check_status(ap);
 
         /* reset the ADMA engine */
         adma_reset_engine(ap);
@@ -281,7 +243,7 @@ static void adma_freeze(struct ata_port *ap)
 
         /* mask/clear ATA interrupts */
         writeb(ATA_NIEN, ap->ioaddr.ctl_addr);
-        ata_check_status(ap);
+        ata_sff_check_status(ap);
 
         /* reset ADMA to idle state */
         writew(aPIOMD4 | aNIEN | aRSTADM, chan + ADMA_CONTROL);
@@ -304,13 +266,7 @@ static int adma_prereset(struct ata_link *link, unsigned long deadline)
                 pp->state = adma_state_mmio;
         adma_reinit_engine(ap);
 
-        return ata_std_prereset(link, deadline);
-}
-
-static void adma_error_handler(struct ata_port *ap)
-{
-        ata_do_eh(ap, adma_prereset, ata_std_softreset, NULL,
-                  ata_std_postreset);
+        return ata_sff_prereset(link, deadline);
 }
 
 static int adma_fill_sg(struct ata_queued_cmd *qc)
@@ -366,7 +322,7 @@ static void adma_qc_prep(struct ata_queued_cmd *qc)
 
         adma_enter_reg_mode(qc->ap);
         if (qc->tf.protocol != ATA_PROT_DMA) {
-                ata_qc_prep(qc);
+                ata_sff_qc_prep(qc);
                 return;
         }
 
@@ -465,7 +421,7 @@ static unsigned int adma_qc_issue(struct ata_queued_cmd *qc)
         }
 
         pp->state = adma_state_mmio;
-        return ata_qc_issue_prot(qc);
+        return ata_sff_qc_issue(qc);
 }
 
 static inline unsigned int adma_intr_pkt(struct ata_host *host)
@@ -536,7 +492,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
                         if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
 
                                 /* check main status, clearing INTRQ */
-                                u8 status = ata_check_status(ap);
+                                u8 status = ata_sff_check_status(ap);
                                 if ((status & ATA_BUSY))
                                         continue;
                                 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
@@ -633,14 +589,6 @@ static void adma_port_stop(struct ata_port *ap)
         adma_reset_engine(ap);
 }
 
-static void adma_host_stop(struct ata_host *host)
-{
-        unsigned int port_no;
-
-        for (port_no = 0; port_no < ADMA_PORTS; ++port_no)
-                adma_reset_engine(host->ports[port_no]);
-}
-
 static void adma_host_init(struct ata_host *host, unsigned int chip_id)
 {
         unsigned int port_no;