1 files changed, 6 insertions, 60 deletions

diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 8f79447b6151..fb2cf661b0e8 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -64,22 +64,7 @@ static int opti_pre_reset(struct ata_link *link, unsigned long deadline)
         if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(link, deadline);
-}
-
-/**
- *      opti_probe_reset                -       probe reset
- *      @ap: ATA port
- *
- *      Perform the ATA probe and bus reset sequence plus specific handling
- *      for this hardware. The Opti needs little handling - we have no UDMA66
- *      capability that needs cable detection. All we must do is check the port
- *      is enabled.
- */
-
-static void opti_error_handler(struct ata_port *ap)
-{
-        ata_bmdma_drive_eh(ap, opti_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
+        return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -165,58 +150,19 @@ static void opti_set_piomode(struct ata_port *ap, struct ata_device *adev)
 }
 
 static struct scsi_host_template opti_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 opti_port_ops = {
-        .set_piomode    = opti_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  = opti_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .inherits       = &ata_sff_port_ops,
         .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    = opti_set_piomode,
+        .prereset       = opti_pre_reset,
 };
 
 static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info = {
-                .sht = &opti_sht,
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .port_ops = &opti_port_ops
@@ -227,7 +173,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(dev, ppi);
+        return ata_pci_sff_init_one(dev, ppi, &opti_sht, NULL);
 }
 
 static const struct pci_device_id opti[] = {