1 files changed, 6 insertions, 42 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index c05b36c94d51..57efbf05c95f 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -132,53 +132,17 @@ static struct scsi_host_template pcmcia_sht = {
 };
 
 static struct ata_port_operations pcmcia_port_ops = {
-        .set_mode       = pcmcia_set_mode,
-        .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   = ata_cable_40wire,
-
-        .qc_prep        = ata_qc_prep,
-        .qc_issue       = ata_qc_issue_prot,
-
+        .inherits       = &ata_sff_port_ops,
         .data_xfer      = ata_data_xfer_noirq,
-
-        .irq_clear      = ata_noop_irq_clear,
-        .irq_on         = ata_irq_on,
-
-        .port_start     = ata_sff_port_start,
+        .cable_detect   = ata_cable_40wire,
+        .set_mode       = pcmcia_set_mode,
 };
 
 static struct ata_port_operations pcmcia_8bit_port_ops = {
-        .set_mode       = pcmcia_set_mode_8bit,
-        .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   = ata_cable_40wire,
-
-        .qc_prep        = ata_qc_prep,
-        .qc_issue       = ata_qc_issue_prot,
-
+        .inherits       = &ata_sff_port_ops,
         .data_xfer      = ata_data_xfer_8bit,
-
-        .irq_clear      = ata_noop_irq_clear,
-        .irq_on         = ata_irq_on,
-
-        .port_start     = ata_sff_port_start,
+        .cable_detect   = ata_cable_40wire,
+        .set_mode       = pcmcia_set_mode_8bit,
 };
 
 #define CS_CHECK(fn, ret) \