66 files changed, 3 insertions, 130 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c888c966a020..0d80189d03f3 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -264,8 +264,6 @@ static struct scsi_host_template ahci_sht = {
 };
 
 static const struct ata_port_operations ahci_ops = {
-        .port_disable           = ata_port_disable,
-
         .check_status           = ahci_check_status,
         .check_altstatus        = ahci_check_status,
         .dev_select             = ata_noop_dev_select,
@@ -296,8 +294,6 @@ static const struct ata_port_operations ahci_ops = {
 };
 
 static const struct ata_port_operations ahci_vt8251_ops = {
-        .port_disable           = ata_port_disable,
-
         .check_status           = ahci_check_status,
         .check_altstatus        = ahci_check_status,
         .dev_select             = ata_noop_dev_select,
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 6ec1bbc4fcc4..afe71a6e0dab 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -95,7 +95,6 @@ static struct scsi_host_template generic_sht = {
 static struct ata_port_operations generic_port_ops = {
         .set_mode       = generic_set_mode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 68bc0ae671c5..45e3b60f26d0 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -290,7 +290,6 @@ static struct scsi_host_template piix_sht = {
 };
 
 static const struct ata_port_operations piix_pata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = piix_set_piomode,
         .set_dmamode            = piix_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -323,7 +322,6 @@ static const struct ata_port_operations piix_pata_ops = {
 };
 
 static const struct ata_port_operations ich_pata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = piix_set_piomode,
         .set_dmamode            = ich_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -356,8 +354,6 @@ static const struct ata_port_operations ich_pata_ops = {
 };
 
 static const struct ata_port_operations piix_sata_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4f8b8d210cf4..43c329544c00 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2208,7 +2208,6 @@ int ata_bus_probe(struct ata_port *ap)
 
         /* no device present, disable port */
         ata_port_disable(ap);
-        ap->ops->port_disable(ap);
         return -ENODEV;
 
  fail:
@@ -3227,7 +3226,7 @@ void ata_bus_reset(struct ata_port *ap)
 
 err_out:
         ata_port_printk(ap, KERN_ERR, "disabling port\n");
-        ap->ops->port_disable(ap);
+        ata_port_disable(ap);
 
         DPRINTK("EXIT\n");
 }
@@ -6986,7 +6985,6 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc)
 }
 
 const struct ata_port_operations ata_dummy_port_ops = {
-        .port_disable           = ata_port_disable,
         .check_status           = ata_dummy_check_status,
         .check_altstatus        = ata_dummy_check_status,
         .dev_select             = ata_noop_dev_select,
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 9436c4963929..7fc11ef0fd26 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -305,7 +305,6 @@ static struct scsi_host_template ali_sht = {
  */
 
 static struct ata_port_operations ali_early_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = ali_set_piomode,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
@@ -336,8 +335,6 @@ static struct ata_port_operations ali_early_port_ops = {
  *      detect
  */
 static struct ata_port_operations ali_20_port_ops = {
-        .port_disable   = ata_port_disable,
-
         .set_piomode    = ali_set_piomode,
         .set_dmamode    = ali_set_dmamode,
         .mode_filter    = ali_20_filter,
@@ -376,7 +373,6 @@ static struct ata_port_operations ali_20_port_ops = {
  *      Port operations for DMA capable ALi with cable detect
  */
 static struct ata_port_operations ali_c2_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = ali_set_piomode,
         .set_dmamode    = ali_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -414,7 +410,6 @@ static struct ata_port_operations ali_c2_port_ops = {
  *      Port operations for DMA capable ALi with cable detect and LBA48
  */
 static struct ata_port_operations ali_c5_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = ali_set_piomode,
         .set_dmamode    = ali_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index c95922f8cc5e..b1db7ff8edd1 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -332,7 +332,6 @@ static struct scsi_host_template amd_sht = {
 };
 
 static struct ata_port_operations amd33_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = amd33_set_piomode,
         .set_dmamode    = amd33_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -366,7 +365,6 @@ static struct ata_port_operations amd33_port_ops = {
 };
 
 static struct ata_port_operations amd66_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = amd66_set_piomode,
         .set_dmamode    = amd66_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -400,7 +398,6 @@ static struct ata_port_operations amd66_port_ops = {
 };
 
 static struct ata_port_operations amd100_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = amd100_set_piomode,
         .set_dmamode    = amd100_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -434,7 +431,6 @@ static struct ata_port_operations amd100_port_ops = {
 };
 
 static struct ata_port_operations amd133_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = amd133_set_piomode,
         .set_dmamode    = amd133_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -468,7 +464,6 @@ static struct ata_port_operations amd133_port_ops = {
 };
 
 static struct ata_port_operations nv100_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = nv100_set_piomode,
         .set_dmamode    = nv100_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -502,7 +497,6 @@ static struct ata_port_operations nv100_port_ops = {
 };
 
 static struct ata_port_operations nv133_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = nv133_set_piomode,
         .set_dmamode    = nv133_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 8c864353596e..1827843cda46 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -332,7 +332,6 @@ static struct scsi_host_template artop_sht = {
 };
 
 static const struct ata_port_operations artop6210_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = artop6210_set_piomode,
         .set_dmamode            = artop6210_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -366,7 +365,6 @@ static const struct ata_port_operations artop6210_ops = {
 };
 
 static const struct ata_port_operations artop6260_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = artop6260_set_piomode,
         .set_dmamode            = artop6260_set_dmamode,
 
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index f2bfdeb44023..0077ee783d1e 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -233,7 +233,6 @@ static struct scsi_host_template atiixp_sht = {
 };
 
 static struct ata_port_operations atiixp_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = atiixp_set_piomode,
         .set_dmamode    = atiixp_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index a292ed97246d..f09d4fa275ce 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -184,7 +184,6 @@ static struct scsi_host_template cmd640_sht = {
 };
 
 static struct ata_port_operations cmd640_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cmd640_set_piomode,
         .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index d308c4644647..9e412c26b2a3 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -284,7 +284,6 @@ static struct scsi_host_template cmd64x_sht = {
 };
 
 static struct ata_port_operations cmd64x_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cmd64x_set_piomode,
         .set_dmamode    = cmd64x_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -318,7 +317,6 @@ static struct ata_port_operations cmd64x_port_ops = {
 };
 
 static struct ata_port_operations cmd646r1_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cmd64x_set_piomode,
         .set_dmamode    = cmd64x_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -352,7 +350,6 @@ static struct ata_port_operations cmd646r1_port_ops = {
 };
 
 static struct ata_port_operations cmd648_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cmd64x_set_piomode,
         .set_dmamode    = cmd64x_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 300dcff949e2..fe37e3e80f27 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -158,7 +158,6 @@ static struct scsi_host_template cs5520_sht = {
 };
 
 static struct ata_port_operations cs5520_port_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = cs5520_set_piomode,
         .set_dmamode            = cs5520_set_dmamode,
 
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 2b770072f392..adeb3acf84cf 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -179,7 +179,6 @@ static struct scsi_host_template cs5530_sht = {
 };
 
 static struct ata_port_operations cs5530_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cs5530_set_piomode,
         .set_dmamode    = cs5530_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 94b1a9caf3cb..2c73807da626 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -176,7 +176,6 @@ static struct scsi_host_template cs5535_sht = {
 };
 
 static struct ata_port_operations cs5535_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cs5535_set_piomode,
         .set_dmamode    = cs5535_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 8c439a9bb5dd..cae44250d814 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -128,7 +128,6 @@ static struct scsi_host_template cy82c693_sht = {
 };
 
 static struct ata_port_operations cy82c693_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = cy82c693_set_piomode,
         .set_dmamode    = cy82c693_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 4d646ffb257b..cc418e34e63b 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -251,7 +251,6 @@ static struct scsi_host_template efar_sht = {
 };
 
 static const struct ata_port_operations efar_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = efar_set_piomode,
         .set_dmamode            = efar_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 508d1cab52d1..16cc143460e4 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -312,7 +312,6 @@ static struct scsi_host_template hpt36x_sht = {
  */
 
 static struct ata_port_operations hpt366_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt366_set_piomode,
         .set_dmamode    = hpt366_set_dmamode,
         .mode_filter    = hpt366_filter,
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 896e6e31c67f..65c0cb21f6a0 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -644,7 +644,6 @@ static struct scsi_host_template hpt37x_sht = {
  */
 
 static struct ata_port_operations hpt370_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt370_set_piomode,
         .set_dmamode    = hpt370_set_dmamode,
         .mode_filter    = hpt370_filter,
@@ -682,7 +681,6 @@ static struct ata_port_operations hpt370_port_ops = {
  */
 
 static struct ata_port_operations hpt370a_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt370_set_piomode,
         .set_dmamode    = hpt370_set_dmamode,
         .mode_filter    = hpt370a_filter,
@@ -721,7 +719,6 @@ static struct ata_port_operations hpt370a_port_ops = {
  */
 
 static struct ata_port_operations hpt372_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt372_set_piomode,
         .set_dmamode    = hpt372_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -760,7 +757,6 @@ static struct ata_port_operations hpt372_port_ops = {
  */
 
 static struct ata_port_operations hpt374_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt372_set_piomode,
         .set_dmamode    = hpt372_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 2b7f099ac785..5559da7f9db3 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -361,7 +361,6 @@ static struct scsi_host_template hpt3x2n_sht = {
  */
 
 static struct ata_port_operations hpt3x2n_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt3x2n_set_piomode,
         .set_dmamode    = hpt3x2n_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index a2f81f40d7ac..752394b72652 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -120,7 +120,6 @@ static struct scsi_host_template hpt3x3_sht = {
 };
 
 static struct ata_port_operations hpt3x3_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = hpt3x3_set_piomode,
 #if defined(CONFIG_PATA_HPT3X3_DMA)
         .set_dmamode    = hpt3x3_set_dmamode,
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index ffcccfc0b9d4..4a69328a4c43 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -358,8 +358,6 @@ static void pata_icside_error_handler(struct ata_port *ap)
 }
 
 static struct ata_port_operations pata_icside_port_ops = {
-        .port_disable           = ata_port_disable,
-
         .set_dmamode            = pata_icside_set_dmamode,
 
         .tf_load                = ata_tf_load,
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index b8d6d5c43537..1def8c05f345 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -38,7 +38,6 @@ static struct scsi_host_template isapnp_sht = {
 };
 
 static struct ata_port_operations isapnp_port_ops = {
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 8aae9d7171c1..cc989ef30420 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -261,7 +261,6 @@ static struct scsi_host_template it8213_sht = {
 };
 
 static const struct ata_port_operations it8213_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = it8213_set_piomode,
         .set_dmamode            = it8213_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 0179b29c5156..4188898a66a0 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -620,7 +620,6 @@ static struct scsi_host_template it821x_sht = {
 
 static struct ata_port_operations it821x_smart_port_ops = {
         .set_mode       = it821x_smart_set_mode,
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .mode_filter    = ata_pci_default_filter,
@@ -655,7 +654,6 @@ static struct ata_port_operations it821x_smart_port_ops = {
 };
 
 static struct ata_port_operations it821x_passthru_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = it821x_passthru_set_piomode,
         .set_dmamode    = it821x_passthru_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index ce1f9b17ad32..7b0d2fc57484 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -107,7 +107,6 @@ static struct ata_port_operations ixp4xx_port_ops = {
         .set_mode               = ixp4xx_set_mode,
         .mode_filter            = ata_pci_default_filter,
 
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .exec_command           = ata_exec_command,
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 26f84063859d..6d5a81869df6 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -141,8 +141,6 @@ static struct scsi_host_template jmicron_sht = {
 };
 
 static const struct ata_port_operations jmicron_ops = {
-        .port_disable           = ata_port_disable,
-
         /* Task file is PCI ATA format, use helpers */
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 6529d34f0370..6cae26f4d272 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -150,7 +150,6 @@ static struct scsi_host_template legacy_sht = {
  */
 
 static struct ata_port_operations simple_port_ops = {
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -178,7 +177,6 @@ static struct ata_port_operations simple_port_ops = {
 static struct ata_port_operations legacy_port_ops = {
         .set_mode       = legacy_set_mode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -293,7 +291,6 @@ static void pdc_data_xfer_vlb(struct ata_device *adev, unsigned char *buf, unsig
 static struct ata_port_operations pdc20230_port_ops = {
         .set_piomode    = pdc20230_set_piomode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -348,7 +345,6 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
 static struct ata_port_operations ht6560a_port_ops = {
         .set_piomode    = ht6560a_set_piomode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -414,7 +410,6 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
 static struct ata_port_operations ht6560b_port_ops = {
         .set_piomode    = ht6560b_set_piomode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -535,7 +530,6 @@ static void opti82c611a_set_piomode(struct ata_port *ap, struct ata_device *adev
 static struct ata_port_operations opti82c611a_port_ops = {
         .set_piomode    = opti82c611a_set_piomode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -668,7 +662,6 @@ static unsigned int opti82c46x_qc_issue_prot(struct ata_queued_cmd *qc)
 static struct ata_port_operations opti82c46x_port_ops = {
         .set_piomode    = opti82c46x_set_piomode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 021d9d9218bd..99d0844c8cb8 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -111,8 +111,6 @@ static struct scsi_host_template marvell_sht = {
 };
 
 static const struct ata_port_operations marvell_ops = {
-        .port_disable           = ata_port_disable,
-
         /* Task file is PCI ATA format, use helpers */
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 6e3fac2fedc4..a56694b2833e 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -283,7 +283,6 @@ static struct scsi_host_template mpc52xx_ata_sht = {
 };
 
 static struct ata_port_operations mpc52xx_ata_port_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = mpc52xx_ata_set_piomode,
         .dev_select             = mpc52xx_ata_dev_select,
         .tf_load                = ata_tf_load,
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 8a82fcd4fa31..b50910938e6f 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -169,7 +169,6 @@ static struct scsi_host_template mpiix_sht = {
 };
 
 static struct ata_port_operations mpiix_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = mpiix_set_piomode,
 
         .tf_load        = ata_tf_load,
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 2d64c58482fa..b2c3d0767547 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -40,8 +40,6 @@ static struct scsi_host_template netcell_sht = {
 };
 
 static const struct ata_port_operations netcell_ops = {
-        .port_disable           = ata_port_disable,
-
         /* Task file is PCI ATA format, use helpers */
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 00a763c67f99..4b0ddf6ba3ba 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -162,7 +162,6 @@ static struct scsi_host_template ns87410_sht = {
 };
 
 static struct ata_port_operations ns87410_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = ns87410_set_piomode,
 
         .tf_load        = ata_tf_load,
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 851dae960018..ada719ad45a4 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -238,7 +238,6 @@ static struct scsi_host_template oldpiix_sht = {
 };
 
 static const struct ata_port_operations oldpiix_pata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = oldpiix_set_piomode,
         .set_dmamode            = oldpiix_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 0ab300cda9b7..2a4bfbfbe75a 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -183,7 +183,6 @@ static struct scsi_host_template opti_sht = {
 };
 
 static struct ata_port_operations opti_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = opti_set_piomode,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 51c49283fb39..848ae16f2390 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -368,7 +368,6 @@ static struct scsi_host_template optidma_sht = {
 };
 
 static struct ata_port_operations optidma_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = optidma_set_pio_mode,
         .set_dmamode    = optidma_set_dma_mode,
 
@@ -403,7 +402,6 @@ static struct ata_port_operations optidma_port_ops = {
 };
 
 static struct ata_port_operations optiplus_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = optiplus_set_pio_mode,
         .set_dmamode    = optiplus_set_dma_mode,
 
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index f2167729c3df..5baf531f652e 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -107,7 +107,6 @@ static struct scsi_host_template pcmcia_sht = {
 
 static struct ata_port_operations pcmcia_port_ops = {
         .set_mode       = pcmcia_set_mode,
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 7c6df320c833..5fba36f04ca9 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -147,7 +147,6 @@ static struct scsi_host_template pdc2027x_sht = {
 };
 
 static struct ata_port_operations pdc2027x_pata100_ops = {
-        .port_disable           = ata_port_disable,
         .mode_filter            = ata_pci_default_filter,
 
         .tf_load                = ata_tf_load,
@@ -178,7 +177,6 @@ static struct ata_port_operations pdc2027x_pata100_ops = {
 };
 
 static struct ata_port_operations pdc2027x_pata133_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = pdc2027x_set_piomode,
         .set_dmamode            = pdc2027x_set_dmamode,
         .set_mode               = pdc2027x_set_mode,
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index b03b33872457..9b7077d51489 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -247,7 +247,6 @@ static struct scsi_host_template pdc202xx_sht = {
 };
 
 static struct ata_port_operations pdc2024x_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = pdc202xx_set_piomode,
         .set_dmamode    = pdc202xx_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -280,7 +279,6 @@ static struct ata_port_operations pdc2024x_port_ops = {
 };
 
 static struct ata_port_operations pdc2026x_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = pdc202xx_set_piomode,
         .set_dmamode    = pdc202xx_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a616616706da..b04ce5f98410 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -69,7 +69,6 @@ static struct scsi_host_template pata_platform_sht = {
 static struct ata_port_operations pata_platform_port_ops = {
         .set_mode               = pata_platform_set_mode,
 
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index ade5a4421663..da9ccd23ffc8 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -170,7 +170,6 @@ static struct scsi_host_template qdi_sht = {
 };
 
 static struct ata_port_operations qdi6500_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = qdi6500_set_piomode,
 
         .tf_load        = ata_tf_load,
@@ -197,7 +196,6 @@ static struct ata_port_operations qdi6500_port_ops = {
 };
 
 static struct ata_port_operations qdi6580_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = qdi6580_set_piomode,
 
         .tf_load        = ata_tf_load,
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 66b9a341931b..ece2190971c3 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -203,7 +203,6 @@ static struct scsi_host_template radisys_sht = {
 };
 
 static const struct ata_port_operations radisys_pata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = radisys_set_piomode,
         .set_dmamode            = radisys_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 98784647c7e8..5f1a4e180dc4 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -73,7 +73,6 @@ static struct scsi_host_template rz1000_sht = {
 static struct ata_port_operations rz1000_port_ops = {
         .set_mode       = rz1000_set_mode,
 
-        .port_disable   = ata_port_disable,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 61edff4a5c6e..6c13754c75af 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -197,7 +197,6 @@ static struct scsi_host_template sc1200_sht = {
 };
 
 static struct ata_port_operations sc1200_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = sc1200_set_piomode,
         .set_dmamode    = sc1200_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 95f04b81352f..e138343b5d4e 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -988,7 +988,6 @@ static struct scsi_host_template scc_sht = {
 };
 
 static const struct ata_port_operations scc_pata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = scc_set_piomode,
         .set_dmamode            = scc_set_dmamode,
         .mode_filter            = scc_mode_filter,
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index c87cd67f4152..7c08f25c9544 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -318,7 +318,6 @@ static struct scsi_host_template serverworks_sht = {
 };
 
 static struct ata_port_operations serverworks_osb4_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = serverworks_set_piomode,
         .set_dmamode    = serverworks_set_dmamode,
         .mode_filter    = serverworks_osb4_filter,
@@ -353,7 +352,6 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
 };
 
 static struct ata_port_operations serverworks_csb_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = serverworks_set_piomode,
         .set_dmamode    = serverworks_set_dmamode,
         .mode_filter    = serverworks_csb_filter,
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index c5abf6616543..71f206d7b5c1 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -238,7 +238,6 @@ static struct scsi_host_template sil680_sht = {
 };
 
 static struct ata_port_operations sil680_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = sil680_set_piomode,
         .set_dmamode    = sil680_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 72850667d371..4ccf09dac8c5 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -531,7 +531,6 @@ static struct scsi_host_template sis_sht = {
 };
 
 static const struct ata_port_operations sis_133_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_133_set_piomode,
         .set_dmamode            = sis_133_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -564,7 +563,6 @@ static const struct ata_port_operations sis_133_ops = {
 };
 
 static const struct ata_port_operations sis_133_for_sata_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_133_set_piomode,
         .set_dmamode            = sis_133_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -597,7 +595,6 @@ static const struct ata_port_operations sis_133_for_sata_ops = {
 };
 
 static const struct ata_port_operations sis_133_early_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_100_set_piomode,
         .set_dmamode            = sis_133_early_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -630,7 +627,6 @@ static const struct ata_port_operations sis_133_early_ops = {
 };
 
 static const struct ata_port_operations sis_100_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_100_set_piomode,
         .set_dmamode            = sis_100_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -663,7 +659,6 @@ static const struct ata_port_operations sis_100_ops = {
 };
 
 static const struct ata_port_operations sis_66_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_old_set_piomode,
         .set_dmamode            = sis_66_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -696,7 +691,6 @@ static const struct ata_port_operations sis_66_ops = {
 };
 
 static const struct ata_port_operations sis_old_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = sis_old_set_piomode,
         .set_dmamode            = sis_old_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 1c50c191e4bc..5bd78437e94b 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -225,7 +225,6 @@ static struct scsi_host_template sl82c105_sht = {
 };
 
 static struct ata_port_operations sl82c105_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = sl82c105_set_piomode,
         .mode_filter    = ata_pci_default_filter,
 
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 2a55eed45ad8..dc20b179e3b6 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -198,7 +198,6 @@ static struct scsi_host_template triflex_sht = {
 };
 
 static struct ata_port_operations triflex_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = triflex_set_piomode,
         .mode_filter    = ata_pci_default_filter,
 
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index f11b87e18aae..e1f20e73a61e 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -348,7 +348,6 @@ static struct scsi_host_template via_sht = {
 };
 
 static struct ata_port_operations via_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = via_set_piomode,
         .set_dmamode    = via_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
@@ -383,7 +382,6 @@ static struct ata_port_operations via_port_ops = {
 };
 
 static struct ata_port_operations via_port_ops_noirq = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = via_set_piomode,
         .set_dmamode    = via_set_dmamode,
         .mode_filter    = ata_pci_default_filter,
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index c1647da55543..d7555f775d5d 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -138,7 +138,6 @@ static struct scsi_host_template winbond_sht = {
 };
 
 static struct ata_port_operations winbond_port_ops = {
-        .port_disable   = ata_port_disable,
         .set_piomode    = winbond_set_piomode,
 
         .tf_load        = ata_tf_load,
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 7dd7361289c4..42fd15aaba0b 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -162,7 +162,6 @@ static struct scsi_host_template adma_ata_sht = {
 };
 
 static const struct ata_port_operations adma_ata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .exec_command           = ata_exec_command,
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index d6a3e286c79d..f0ea0e166c11 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -552,7 +552,6 @@ static int inic_port_start(struct ata_port *ap)
 }
 
 static struct ata_port_operations inic_port_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 393fc655f8c1..68c3f22890d2 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -483,8 +483,6 @@ static struct scsi_host_template mv6_sht = {
 };
 
 static const struct ata_port_operations mv5_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -513,8 +511,6 @@ static const struct ata_port_operations mv5_ops = {
 };
 
 static const struct ata_port_operations mv6_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -543,8 +539,6 @@ static const struct ata_port_operations mv6_ops = {
 };
 
 static const struct ata_port_operations mv_iie_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 88ecca6343ea..b860f99fc288 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -340,7 +340,6 @@ static struct scsi_host_template nv_adma_sht = {
 };
 
 static const struct ata_port_operations nv_generic_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .exec_command           = ata_exec_command,
@@ -365,7 +364,6 @@ static const struct ata_port_operations nv_generic_ops = {
 };
 
 static const struct ata_port_operations nv_nf2_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .exec_command           = ata_exec_command,
@@ -390,7 +388,6 @@ static const struct ata_port_operations nv_nf2_ops = {
 };
 
 static const struct ata_port_operations nv_ck804_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .exec_command           = ata_exec_command,
@@ -416,7 +413,6 @@ static const struct ata_port_operations nv_ck804_ops = {
 };
 
 static const struct ata_port_operations nv_adma_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = nv_adma_tf_read,
         .check_atapi_dma        = nv_adma_check_atapi_dma,
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 37d737b442b5..983bff5c4def 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -167,7 +167,6 @@ static struct scsi_host_template pdc_ata_sht = {
 };
 
 static const struct ata_port_operations pdc_sata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = pdc_tf_load_mmio,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -193,7 +192,6 @@ static const struct ata_port_operations pdc_sata_ops = {
 
 /* First-generation chips need a more restrictive ->check_atapi_dma op */
 static const struct ata_port_operations pdc_old_sata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = pdc_tf_load_mmio,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -218,7 +216,6 @@ static const struct ata_port_operations pdc_old_sata_ops = {
 };
 
 static const struct ata_port_operations pdc_pata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = pdc_tf_load_mmio,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 5a60ab72ecb6..10bf52ca1e19 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -145,7 +145,6 @@ static struct scsi_host_template qs_ata_sht = {
 };
 
 static const struct ata_port_operations qs_ata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 1930e7cf1438..df0ac77fcdd4 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -186,7 +186,6 @@ static struct scsi_host_template sil_sht = {
 };
 
 static const struct ata_port_operations sil_ops = {
-        .port_disable           = ata_port_disable,
         .dev_config             = sil_dev_config,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 961b3f201a38..e0cd31aa8002 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -384,8 +384,6 @@ static struct scsi_host_template sil24_sht = {
 };
 
 static const struct ata_port_operations sil24_ops = {
-        .port_disable           = ata_port_disable,
-
         .dev_config             = sil24_dev_config,
 
         .check_status           = sil24_check_status,
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 691017eddbb1..8d98a9fb0a42 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -104,7 +104,6 @@ static struct scsi_host_template sis_sht = {
 };
 
 static const struct ata_port_operations sis_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 006a720da406..822cabfec951 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -329,7 +329,6 @@ static struct scsi_host_template k2_sata_sht = {
 
 
 static const struct ata_port_operations k2_sata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = k2_sata_tf_load,
         .tf_read                = k2_sata_tf_read,
         .check_status           = k2_stat_check_status,
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index d5cbd16629ad..b425061dbe8c 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -254,7 +254,6 @@ static struct scsi_host_template pdc_sata_sht = {
 };
 
 static const struct ata_port_operations pdc_20621_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = pdc_tf_load_mmio,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index d4514e2149bc..6c53a790805f 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -94,8 +94,6 @@ static struct scsi_host_template uli_sht = {
 };
 
 static const struct ata_port_operations uli_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 4b25c3ef986f..25162ec99384 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -122,8 +122,6 @@ static struct scsi_host_template svia_sht = {
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -151,8 +149,6 @@ static const struct ata_port_operations vt6420_sata_ops = {
 };
 
 static const struct ata_port_operations vt6421_pata_ops = {
-        .port_disable           = ata_port_disable,
-
         .set_piomode            = vt6421_set_pio_mode,
         .set_dmamode            = vt6421_set_dma_mode,
 
@@ -184,8 +180,6 @@ static const struct ata_port_operations vt6421_pata_ops = {
 };
 
 static const struct ata_port_operations vt6421_sata_ops = {
-        .port_disable           = ata_port_disable,
-
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 55fb2e0b369a..b1777c3f6d5c 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -317,7 +317,6 @@ static struct scsi_host_template vsc_sata_sht = {
 
 
 static const struct ata_port_operations vsc_sata_ops = {
-        .port_disable           = ata_port_disable,
         .tf_load                = vsc_sata_tf_load,
         .tf_read                = vsc_sata_tf_read,
         .exec_command           = ata_exec_command,
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 9350fbf39f77..b41dfb539021 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4981,7 +4981,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
         rc = ipr_device_reset(ioa_cfg, res);
 
         if (rc) {
-                ap->ops->port_disable(ap);
+                ata_port_disable(ap);
                 goto out_unlock;
         }
 
@@ -4996,7 +4996,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
                 break;
         default:
                 ap->link.device[0].class = ATA_DEV_UNKNOWN;
-                ap->ops->port_disable(ap);
+                ata_port_disable(ap);
                 break;
         };
 
@@ -5262,7 +5262,6 @@ static u8 ipr_ata_check_altstatus(struct ata_port *ap)
 }
 
 static struct ata_port_operations ipr_sata_ops = {
-        .port_disable = ata_port_disable,
         .check_status = ipr_ata_check_status,
         .check_altstatus = ipr_ata_check_altstatus,
         .dev_select = ata_noop_dev_select,
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 1d6503d85f02..0829b55c64d2 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -350,7 +350,6 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
 }
 
 static struct ata_port_operations sas_sata_ops = {
-        .port_disable           = ata_port_disable,
         .check_status           = sas_ata_check_status,
         .check_altstatus        = sas_ata_check_status,
         .dev_select             = ata_noop_dev_select,