1 files changed, 19 insertions, 52 deletions

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 7c5b2dd9a1a1..720b8645f58a 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -192,54 +192,14 @@ static void sil680_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 
 static struct scsi_host_template sil680_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 struct ata_port_operations sil680_port_ops = {
+        .inherits       = &ata_bmdma_port_ops,
+        .cable_detect   = sil680_cable_detect,
         .set_piomode    = sil680_set_piomode,
         .set_dmamode    = sil680_set_dmamode,
-        .mode_filter    = ata_pci_default_filter,
-        .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   = sil680_cable_detect,
-
-        .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,
-
-        .irq_handler    = ata_interrupt,
-        .irq_clear      = ata_bmdma_irq_clear,
-        .irq_on         = ata_irq_on,
-
-        .port_start     = ata_sff_port_start,
 };
 
 /**
@@ -322,7 +282,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
                                      const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
-                .sht = &sil680_sht,
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
@@ -330,7 +289,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
                 .port_ops = &sil680_port_ops
         };
         static const struct ata_port_info info_slow = {
-                .sht = &sil680_sht,
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
@@ -346,6 +304,10 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
+        rc = pcim_enable_device(pdev);
+        if (rc)
+                return rc;
+
         switch (sil680_init_chip(pdev, &try_mmio)) {
                 case 0:
                         ppi[0] = &info_slow;
@@ -388,28 +350,33 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
         host->ports[0]->ioaddr.cmd_addr = mmio_base + 0x80;
         host->ports[0]->ioaddr.ctl_addr = mmio_base + 0x8a;
         host->ports[0]->ioaddr.altstatus_addr = mmio_base + 0x8a;
-        ata_std_ports(&host->ports[0]->ioaddr);
+        ata_sff_std_ports(&host->ports[0]->ioaddr);
         host->ports[1]->ioaddr.bmdma_addr = mmio_base + 0x08;
         host->ports[1]->ioaddr.cmd_addr = mmio_base + 0xc0;
         host->ports[1]->ioaddr.ctl_addr = mmio_base + 0xca;
         host->ports[1]->ioaddr.altstatus_addr = mmio_base + 0xca;
-        ata_std_ports(&host->ports[1]->ioaddr);
+        ata_sff_std_ports(&host->ports[1]->ioaddr);
 
         /* Register & activate */
-        return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED,
-                                 &sil680_sht);
+        return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
+                                 IRQF_SHARED, &sil680_sht);
 
 use_ioports:
-        return ata_pci_init_one(pdev, ppi);
+        return ata_pci_sff_init_one(pdev, ppi, &sil680_sht, NULL);
 }
 
 #ifdef CONFIG_PM
 static int sil680_reinit_one(struct pci_dev *pdev)
 {
-        int try_mmio;
+        struct ata_host *host = dev_get_drvdata(&pdev->dev);
+        int try_mmio, rc;
 
+        rc = ata_pci_device_do_resume(pdev);
+        if (rc)
+                return rc;
         sil680_init_chip(pdev, &try_mmio);
-        return ata_pci_device_resume(pdev);
+        ata_host_resume(host);
+        return 0;
 }
 #endif