1 files changed, 9 insertions, 46 deletions

diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index e710e71b7b92..f277cea904ce 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -76,50 +76,13 @@ static struct pci_driver uli_pci_driver = {
 };
 
 static struct scsi_host_template uli_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 uli_ops = {
-        .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,
-
-        .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,
-
-        .freeze                 = ata_bmdma_freeze,
-        .thaw                   = ata_bmdma_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,
-
+static struct ata_port_operations uli_ops = {
+        .inherits               = &ata_bmdma_port_ops,
         .scr_read               = uli_scr_read,
         .scr_write              = uli_scr_write,
-
-        .port_start             = ata_port_start,
 };
 
 static const struct ata_port_info uli_port_info = {
@@ -212,11 +175,11 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         host->private_data = hpriv;
 
         /* the first two ports are standard SFF */
-        rc = ata_pci_init_sff_host(host);
+        rc = ata_pci_sff_init_host(host);
         if (rc)
                 return rc;
 
-        rc = ata_pci_init_bmdma(host);
+        rc = ata_pci_bmdma_init(host);
         if (rc)
                 return rc;
 
@@ -237,7 +200,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         ((unsigned long)iomap[1] | ATA_PCI_CTL_OFS) + 4;
                 ioaddr->bmdma_addr = iomap[4] + 16;
                 hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4;
-                ata_std_ports(ioaddr);
+                ata_sff_std_ports(ioaddr);
 
                 ata_port_desc(host->ports[2],
                         "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
@@ -252,7 +215,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         ((unsigned long)iomap[3] | ATA_PCI_CTL_OFS) + 4;
                 ioaddr->bmdma_addr = iomap[4] + 24;
                 hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5;
-                ata_std_ports(ioaddr);
+                ata_sff_std_ports(ioaddr);
 
                 ata_port_desc(host->ports[2],
                         "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
@@ -279,8 +242,8 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_master(pdev);
         pci_intx(pdev, 1);
-        return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED,
-                                 &uli_sht);
+        return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
+                                 IRQF_SHARED, &uli_sht);
 }
 
 static int __init uli_init(void)