Merge branch 'merge-fixes' into devel

1 files changed, 7 insertions, 47 deletions

diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 15dd649f89ee..565e67cd13fa 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -73,60 +73,20 @@ static void ninja32_dev_select(struct ata_port *ap, unsigned int device)
         struct ata_device *adev = &ap->link.device[device];
         if (ap->private_data != adev) {
                 iowrite8(0xd6, ap->ioaddr.bmdma_addr + 0x1f);
-                ata_std_dev_select(ap, device);
+                ata_sff_dev_select(ap, device);
                 ninja32_set_piomode(ap, adev);
         }
 }
 
 static struct scsi_host_template ninja32_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 ninja32_port_ops = {
-        .set_piomode    = ninja32_set_piomode,
-        .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     = ninja32_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_bmdma_port_ops,
+        .sff_dev_select = ninja32_dev_select,
         .cable_detect   = ata_cable_40wire,
-
-        .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,
+        .set_piomode    = ninja32_set_piomode,
 };
 
 static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
@@ -172,7 +132,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         ap->ioaddr.ctl_addr = base + 0x1E;
         ap->ioaddr.altstatus_addr = base + 0x1E;
         ap->ioaddr.bmdma_addr = base;
-        ata_std_ports(&ap->ioaddr);
+        ata_sff_std_ports(&ap->ioaddr);
 
         iowrite8(0x05, base + 0x01);    /* Enable interrupt lines */
         iowrite8(0xBE, base + 0x02);    /* Burst, ?? setup */
@@ -182,7 +142,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         iowrite8(0xa4, base + 0x1c);    /* Unknown */
         iowrite8(0x83, base + 0x1d);    /* BMDMA control: WAIT0 */
         /* FIXME: Should we disable them at remove ? */
-        return ata_host_activate(host, dev->irq, ata_interrupt,
+        return ata_host_activate(host, dev->irq, ata_sff_interrupt,
                                  IRQF_SHARED, &ninja32_sht);
 }