1 files changed, 4 insertions, 59 deletions

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 318a36988900..627abcf85c6e 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -302,71 +302,16 @@ static struct scsi_host_template serverworks_sht = {
 };
 
 static struct ata_port_operations serverworks_osb4_port_ops = {
+        .inherits       = &ata_bmdma_port_ops,
+        .cable_detect   = serverworks_cable_detect,
+        .mode_filter    = serverworks_osb4_filter,
         .set_piomode    = serverworks_set_piomode,
         .set_dmamode    = serverworks_set_dmamode,
-        .mode_filter    = serverworks_osb4_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  = ata_bmdma_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
-        .cable_detect   = serverworks_cable_detect,
-
-        .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,
 };
 
 static struct ata_port_operations serverworks_csb_port_ops = {
-        .set_piomode    = serverworks_set_piomode,
-        .set_dmamode    = serverworks_set_dmamode,
+        .inherits       = &serverworks_osb4_port_ops,
         .mode_filter    = serverworks_csb_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  = ata_bmdma_error_handler,
-        .post_internal_cmd = ata_bmdma_post_internal_cmd,
-        .cable_detect   = serverworks_cable_detect,
-
-        .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,
 };
 
 static int serverworks_fixup_osb4(struct pci_dev *pdev)