1 files changed, 11 insertions, 111 deletions

diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 7d6fac43e2f9..c42eec70d297 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -627,36 +627,15 @@ static struct scsi_host_template hpt37x_sht = {
  */
 
 static struct ata_port_operations hpt370_port_ops = {
-        .set_piomode    = hpt370_set_piomode,
-        .set_dmamode    = hpt370_set_dmamode,
-        .mode_filter    = hpt370_filter,
-
-        .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  = hpt37x_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .inherits       = &ata_bmdma_port_ops,
 
-        .bmdma_setup    = ata_bmdma_setup,
         .bmdma_start    = hpt370_bmdma_start,
         .bmdma_stop     = hpt370_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,
+        .mode_filter    = hpt370_filter,
+        .set_piomode    = hpt370_set_piomode,
+        .set_dmamode    = hpt370_set_dmamode,
+        .error_handler  = hpt37x_error_handler,
 };
 
 /*
@@ -664,36 +643,8 @@ static struct ata_port_operations hpt370_port_ops = {
  */
 
 static struct ata_port_operations hpt370a_port_ops = {
-        .set_piomode    = hpt370_set_piomode,
-        .set_dmamode    = hpt370_set_dmamode,
+        .inherits       = &hpt370_port_ops,
         .mode_filter    = hpt370a_filter,
-
-        .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  = hpt37x_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
-
-        .bmdma_setup    = ata_bmdma_setup,
-        .bmdma_start    = hpt370_bmdma_start,
-        .bmdma_stop     = hpt370_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,
 };
 
 /*
@@ -702,36 +653,13 @@ static struct ata_port_operations hpt370a_port_ops = {
  */
 
 static struct ata_port_operations hpt372_port_ops = {
-        .set_piomode    = hpt372_set_piomode,
-        .set_dmamode    = hpt372_set_dmamode,
-        .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     = ata_std_dev_select,
-
-        .freeze         = ata_bmdma_freeze,
-        .thaw           = ata_bmdma_thaw,
-        .error_handler  = hpt37x_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .inherits       = &ata_bmdma_port_ops,
 
-        .bmdma_setup    = ata_bmdma_setup,
-        .bmdma_start    = ata_bmdma_start,
         .bmdma_stop     = hpt37x_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    = hpt372_set_piomode,
+        .set_dmamode    = hpt372_set_dmamode,
+        .error_handler  = hpt37x_error_handler,
 };
 
 /*
@@ -740,36 +668,8 @@ static struct ata_port_operations hpt372_port_ops = {
  */
 
 static struct ata_port_operations hpt374_port_ops = {
-        .set_piomode    = hpt372_set_piomode,
-        .set_dmamode    = hpt372_set_dmamode,
-        .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     = ata_std_dev_select,
-
-        .freeze         = ata_bmdma_freeze,
-        .thaw           = ata_bmdma_thaw,
+        .inherits       = &hpt372_port_ops,
         .error_handler  = hpt374_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
-
-        .bmdma_setup    = ata_bmdma_setup,
-        .bmdma_start    = ata_bmdma_start,
-        .bmdma_stop     = hpt37x_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,
 };
 
 /**