1 files changed, 32 insertions, 77 deletions

diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 257951d03dbb..e10816931b2f 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -395,11 +395,11 @@ static void it821x_passthru_dev_select(struct ata_port *ap,
                 it821x_program(ap, adev, itdev->pio[adev->devno]);
                 itdev->last_device = device;
         }
-        ata_std_dev_select(ap, device);
+        ata_sff_dev_select(ap, device);
 }
 
 /**
- *      it821x_smart_qc_issue_prot      -       wrap qc issue prot
+ *      it821x_smart_qc_issue           -       wrap qc issue prot
  *      @qc: command
  *
  *      Wrap the command issue sequence for the IT821x. We need to
@@ -407,7 +407,7 @@ static void it821x_passthru_dev_select(struct ata_port *ap,
  *      usual happenings kick off
  */
 
-static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc)
 {
         switch(qc->tf.command)
         {
@@ -427,14 +427,14 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc)
                 case ATA_CMD_ID_ATA:
                 /* Arguably should just no-op this one */
                 case ATA_CMD_SET_FEATURES:
-                        return ata_qc_issue_prot(qc);
+                        return ata_sff_qc_issue(qc);
         }
         printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command);
         return AC_ERR_DEV;
 }
 
 /**
- *      it821x_passthru_qc_issue_prot   -       wrap qc issue prot
+ *      it821x_passthru_qc_issue        -       wrap qc issue prot
  *      @qc: command
  *
  *      Wrap the command issue sequence for the IT821x. We need to
@@ -442,10 +442,10 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc)
  *      usual happenings kick off
  */
 
-static unsigned int it821x_passthru_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int it821x_passthru_qc_issue(struct ata_queued_cmd *qc)
 {
         it821x_passthru_dev_select(qc->ap, qc->dev->devno);
-        return ata_qc_issue_prot(qc);
+        return ata_sff_qc_issue(qc);
 }
 
 /**
@@ -632,89 +632,34 @@ static int it821x_port_start(struct ata_port *ap)
 }
 
 static struct scsi_host_template it821x_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 it821x_smart_port_ops = {
-        .set_mode       = it821x_smart_set_mode,
-        .tf_load        = ata_tf_load,
-        .tf_read        = ata_tf_read,
-        .mode_filter    = ata_pci_default_filter,
+        .inherits       = &ata_bmdma_port_ops,
 
-        .check_status   = ata_check_status,
         .check_atapi_dma= it821x_check_atapi_dma,
-        .exec_command   = ata_exec_command,
-        .dev_select     = ata_std_dev_select,
-        .dev_config     = it821x_dev_config,
+        .qc_issue       = it821x_smart_qc_issue,
 
-        .freeze         = ata_bmdma_freeze,
-        .thaw           = ata_bmdma_thaw,
-        .error_handler  = ata_bmdma_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
         .cable_detect   = it821x_ident_hack,
-
-        .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       = it821x_smart_qc_issue_prot,
-
-        .data_xfer      = ata_data_xfer,
-
-        .irq_handler    = ata_interrupt,
-        .irq_clear      = ata_bmdma_irq_clear,
-        .irq_on         = ata_irq_on,
+        .set_mode       = it821x_smart_set_mode,
+        .dev_config     = it821x_dev_config,
 
         .port_start     = it821x_port_start,
 };
 
 static struct ata_port_operations it821x_passthru_port_ops = {
-        .set_piomode    = it821x_passthru_set_piomode,
-        .set_dmamode    = it821x_passthru_set_dmamode,
-        .mode_filter    = ata_pci_default_filter,
+        .inherits       = &ata_bmdma_port_ops,
 
-        .tf_load        = ata_tf_load,
-        .tf_read        = ata_tf_read,
-        .check_status   = ata_check_status,
-        .exec_command   = ata_exec_command,
         .check_atapi_dma= it821x_check_atapi_dma,
-        .dev_select     = it821x_passthru_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   = ata_cable_unknown,
-
-        .bmdma_setup    = ata_bmdma_setup,
+        .sff_dev_select = it821x_passthru_dev_select,
         .bmdma_start    = it821x_passthru_bmdma_start,
         .bmdma_stop     = it821x_passthru_bmdma_stop,
-        .bmdma_status   = ata_bmdma_status,
-
-        .qc_prep        = ata_qc_prep,
-        .qc_issue       = it821x_passthru_qc_issue_prot,
-
-        .data_xfer      = ata_data_xfer,
+        .qc_issue       = it821x_passthru_qc_issue,
 
-        .irq_clear      = ata_bmdma_irq_clear,
-        .irq_handler    = ata_interrupt,
-        .irq_on         = ata_irq_on,
+        .cable_detect   = ata_cable_unknown,
+        .set_piomode    = it821x_passthru_set_piomode,
+        .set_dmamode    = it821x_passthru_set_dmamode,
 
         .port_start     = it821x_port_start,
 };
@@ -742,14 +687,12 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         u8 conf;
 
         static const struct ata_port_info info_smart = {
-                .sht = &it821x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &it821x_smart_port_ops
         };
         static const struct ata_port_info info_passthru = {
-                .sht = &it821x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
@@ -759,6 +702,11 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         const struct ata_port_info *ppi[] = { NULL, NULL };
         static char *mode[2] = { "pass through", "smart" };
+        int rc;
+
+        rc = pcim_enable_device(pdev);
+        if (rc)
+                return rc;
 
         /* Force the card into bypass mode if so requested */
         if (it8212_noraid) {
@@ -774,16 +722,23 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         else
                 ppi[0] = &info_smart;
 
-        return ata_pci_init_one(pdev, ppi);
+        return ata_pci_sff_init_one(pdev, ppi, &it821x_sht, NULL);
 }
 
 #ifdef CONFIG_PM
 static int it821x_reinit_one(struct pci_dev *pdev)
 {
+        struct ata_host *host = dev_get_drvdata(&pdev->dev);
+        int rc;
+
+        rc = ata_pci_device_do_resume(pdev);
+        if (rc)
+                return rc;
         /* Resume - turn raid back off if need be */
         if (it8212_noraid)
                 it821x_disable_raid(pdev);
-        return ata_pci_device_resume(pdev);
+        ata_host_resume(host);
+        return rc;
 }
 #endif