aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/ahci.c4
-rw-r--r--drivers/ata/ata_generic.c1
-rw-r--r--drivers/ata/ata_piix.c4
-rw-r--r--drivers/ata/libata-core.c4
-rw-r--r--drivers/ata/pata_ali.c5
-rw-r--r--drivers/ata/pata_amd.c6
-rw-r--r--drivers/ata/pata_artop.c2
-rw-r--r--drivers/ata/pata_atiixp.c1
-rw-r--r--drivers/ata/pata_cmd640.c1
-rw-r--r--drivers/ata/pata_cmd64x.c3
-rw-r--r--drivers/ata/pata_cs5520.c1
-rw-r--r--drivers/ata/pata_cs5530.c1
-rw-r--r--drivers/ata/pata_cs5535.c1
-rw-r--r--drivers/ata/pata_cypress.c1
-rw-r--r--drivers/ata/pata_efar.c1
-rw-r--r--drivers/ata/pata_hpt366.c1
-rw-r--r--drivers/ata/pata_hpt37x.c4
-rw-r--r--drivers/ata/pata_hpt3x2n.c1
-rw-r--r--drivers/ata/pata_hpt3x3.c1
-rw-r--r--drivers/ata/pata_icside.c2
-rw-r--r--drivers/ata/pata_isapnp.c1
-rw-r--r--drivers/ata/pata_it8213.c1
-rw-r--r--drivers/ata/pata_it821x.c2
-rw-r--r--drivers/ata/pata_ixp4xx_cf.c1
-rw-r--r--drivers/ata/pata_jmicron.c2
-rw-r--r--drivers/ata/pata_legacy.c7
-rw-r--r--drivers/ata/pata_marvell.c2
-rw-r--r--drivers/ata/pata_mpc52xx.c1
-rw-r--r--drivers/ata/pata_mpiix.c1
-rw-r--r--drivers/ata/pata_netcell.c2
-rw-r--r--drivers/ata/pata_ns87410.c1
-rw-r--r--drivers/ata/pata_oldpiix.c1
-rw-r--r--drivers/ata/pata_opti.c1
-rw-r--r--drivers/ata/pata_optidma.c2
-rw-r--r--drivers/ata/pata_pcmcia.c1
-rw-r--r--drivers/ata/pata_pdc2027x.c2
-rw-r--r--drivers/ata/pata_pdc202xx_old.c2
-rw-r--r--drivers/ata/pata_platform.c1
-rw-r--r--drivers/ata/pata_qdi.c2
-rw-r--r--drivers/ata/pata_radisys.c1
-rw-r--r--drivers/ata/pata_rz1000.c1
-rw-r--r--drivers/ata/pata_sc1200.c1
-rw-r--r--drivers/ata/pata_scc.c1
-rw-r--r--drivers/ata/pata_serverworks.c2
-rw-r--r--drivers/ata/pata_sil680.c1
-rw-r--r--drivers/ata/pata_sis.c6
-rw-r--r--drivers/ata/pata_sl82c105.c1
-rw-r--r--drivers/ata/pata_triflex.c1
-rw-r--r--drivers/ata/pata_via.c2
-rw-r--r--drivers/ata/pata_winbond.c1
-rw-r--r--drivers/ata/pdc_adma.c1
-rw-r--r--drivers/ata/sata_inic162x.c1
-rw-r--r--drivers/ata/sata_mv.c6
-rw-r--r--drivers/ata/sata_nv.c4
-rw-r--r--drivers/ata/sata_promise.c3
-rw-r--r--drivers/ata/sata_qstor.c1
-rw-r--r--drivers/ata/sata_sil.c1
-rw-r--r--drivers/ata/sata_sil24.c2
-rw-r--r--drivers/ata/sata_sis.c1
-rw-r--r--drivers/ata/sata_svw.c1
-rw-r--r--drivers/ata/sata_sx4.c1
-rw-r--r--drivers/ata/sata_uli.c2
-rw-r--r--drivers/ata/sata_via.c6
-rw-r--r--drivers/ata/sata_vsc.c1
-rw-r--r--drivers/scsi/ipr.c5
-rw-r--r--drivers/scsi/libsas/sas_ata.c1
-rw-r--r--include/linux/libata.h2
67 files changed, 3 insertions, 132 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 = {
264}; 264};
265 265
266static const struct ata_port_operations ahci_ops = { 266static const struct ata_port_operations ahci_ops = {
267 .port_disable = ata_port_disable,
268
269 .check_status = ahci_check_status, 267 .check_status = ahci_check_status,
270 .check_altstatus = ahci_check_status, 268 .check_altstatus = ahci_check_status,
271 .dev_select = ata_noop_dev_select, 269 .dev_select = ata_noop_dev_select,
@@ -296,8 +294,6 @@ static const struct ata_port_operations ahci_ops = {
296}; 294};
297 295
298static const struct ata_port_operations ahci_vt8251_ops = { 296static const struct ata_port_operations ahci_vt8251_ops = {
299 .port_disable = ata_port_disable,
300
301 .check_status = ahci_check_status, 297 .check_status = ahci_check_status,
302 .check_altstatus = ahci_check_status, 298 .check_altstatus = ahci_check_status,
303 .dev_select = ata_noop_dev_select, 299 .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 = {
95static struct ata_port_operations generic_port_ops = { 95static struct ata_port_operations generic_port_ops = {
96 .set_mode = generic_set_mode, 96 .set_mode = generic_set_mode,
97 97
98 .port_disable = ata_port_disable,
99 .tf_load = ata_tf_load, 98 .tf_load = ata_tf_load,
100 .tf_read = ata_tf_read, 99 .tf_read = ata_tf_read,
101 .check_status = ata_check_status, 100 .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 = {
290}; 290};
291 291
292static const struct ata_port_operations piix_pata_ops = { 292static const struct ata_port_operations piix_pata_ops = {
293 .port_disable = ata_port_disable,
294 .set_piomode = piix_set_piomode, 293 .set_piomode = piix_set_piomode,
295 .set_dmamode = piix_set_dmamode, 294 .set_dmamode = piix_set_dmamode,
296 .mode_filter = ata_pci_default_filter, 295 .mode_filter = ata_pci_default_filter,
@@ -323,7 +322,6 @@ static const struct ata_port_operations piix_pata_ops = {
323}; 322};
324 323
325static const struct ata_port_operations ich_pata_ops = { 324static const struct ata_port_operations ich_pata_ops = {
326 .port_disable = ata_port_disable,
327 .set_piomode = piix_set_piomode, 325 .set_piomode = piix_set_piomode,
328 .set_dmamode = ich_set_dmamode, 326 .set_dmamode = ich_set_dmamode,
329 .mode_filter = ata_pci_default_filter, 327 .mode_filter = ata_pci_default_filter,
@@ -356,8 +354,6 @@ static const struct ata_port_operations ich_pata_ops = {
356}; 354};
357 355
358static const struct ata_port_operations piix_sata_ops = { 356static const struct ata_port_operations piix_sata_ops = {
359 .port_disable = ata_port_disable,
360
361 .tf_load = ata_tf_load, 357 .tf_load = ata_tf_load,
362 .tf_read = ata_tf_read, 358 .tf_read = ata_tf_read,
363 .check_status = ata_check_status, 359 .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)
2208 2208
2209 /* no device present, disable port */ 2209 /* no device present, disable port */
2210 ata_port_disable(ap); 2210 ata_port_disable(ap);
2211 ap->ops->port_disable(ap);
2212 return -ENODEV; 2211 return -ENODEV;
2213 2212
2214 fail: 2213 fail:
@@ -3227,7 +3226,7 @@ void ata_bus_reset(struct ata_port *ap)
3227 3226
3228err_out: 3227err_out:
3229 ata_port_printk(ap, KERN_ERR, "disabling port\n"); 3228 ata_port_printk(ap, KERN_ERR, "disabling port\n");
3230 ap->ops->port_disable(ap); 3229 ata_port_disable(ap);
3231 3230
3232 DPRINTK("EXIT\n"); 3231 DPRINTK("EXIT\n");
3233} 3232}
@@ -6986,7 +6985,6 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc)
6986} 6985}
6987 6986
6988const struct ata_port_operations ata_dummy_port_ops = { 6987const struct ata_port_operations ata_dummy_port_ops = {
6989 .port_disable = ata_port_disable,
6990 .check_status = ata_dummy_check_status, 6988 .check_status = ata_dummy_check_status,
6991 .check_altstatus = ata_dummy_check_status, 6989 .check_altstatus = ata_dummy_check_status,
6992 .dev_select = ata_noop_dev_select, 6990 .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 = {
305 */ 305 */
306 306
307static struct ata_port_operations ali_early_port_ops = { 307static struct ata_port_operations ali_early_port_ops = {
308 .port_disable = ata_port_disable,
309 .set_piomode = ali_set_piomode, 308 .set_piomode = ali_set_piomode,
310 .tf_load = ata_tf_load, 309 .tf_load = ata_tf_load,
311 .tf_read = ata_tf_read, 310 .tf_read = ata_tf_read,
@@ -336,8 +335,6 @@ static struct ata_port_operations ali_early_port_ops = {
336 * detect 335 * detect
337 */ 336 */
338static struct ata_port_operations ali_20_port_ops = { 337static struct ata_port_operations ali_20_port_ops = {
339 .port_disable = ata_port_disable,
340
341 .set_piomode = ali_set_piomode, 338 .set_piomode = ali_set_piomode,
342 .set_dmamode = ali_set_dmamode, 339 .set_dmamode = ali_set_dmamode,
343 .mode_filter = ali_20_filter, 340 .mode_filter = ali_20_filter,
@@ -376,7 +373,6 @@ static struct ata_port_operations ali_20_port_ops = {
376 * Port operations for DMA capable ALi with cable detect 373 * Port operations for DMA capable ALi with cable detect
377 */ 374 */
378static struct ata_port_operations ali_c2_port_ops = { 375static struct ata_port_operations ali_c2_port_ops = {
379 .port_disable = ata_port_disable,
380 .set_piomode = ali_set_piomode, 376 .set_piomode = ali_set_piomode,
381 .set_dmamode = ali_set_dmamode, 377 .set_dmamode = ali_set_dmamode,
382 .mode_filter = ata_pci_default_filter, 378 .mode_filter = ata_pci_default_filter,
@@ -414,7 +410,6 @@ static struct ata_port_operations ali_c2_port_ops = {
414 * Port operations for DMA capable ALi with cable detect and LBA48 410 * Port operations for DMA capable ALi with cable detect and LBA48
415 */ 411 */
416static struct ata_port_operations ali_c5_port_ops = { 412static struct ata_port_operations ali_c5_port_ops = {
417 .port_disable = ata_port_disable,
418 .set_piomode = ali_set_piomode, 413 .set_piomode = ali_set_piomode,
419 .set_dmamode = ali_set_dmamode, 414 .set_dmamode = ali_set_dmamode,
420 .mode_filter = ata_pci_default_filter, 415 .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 = {
332}; 332};
333 333
334static struct ata_port_operations amd33_port_ops = { 334static struct ata_port_operations amd33_port_ops = {
335 .port_disable = ata_port_disable,
336 .set_piomode = amd33_set_piomode, 335 .set_piomode = amd33_set_piomode,
337 .set_dmamode = amd33_set_dmamode, 336 .set_dmamode = amd33_set_dmamode,
338 .mode_filter = ata_pci_default_filter, 337 .mode_filter = ata_pci_default_filter,
@@ -366,7 +365,6 @@ static struct ata_port_operations amd33_port_ops = {
366}; 365};
367 366
368static struct ata_port_operations amd66_port_ops = { 367static struct ata_port_operations amd66_port_ops = {
369 .port_disable = ata_port_disable,
370 .set_piomode = amd66_set_piomode, 368 .set_piomode = amd66_set_piomode,
371 .set_dmamode = amd66_set_dmamode, 369 .set_dmamode = amd66_set_dmamode,
372 .mode_filter = ata_pci_default_filter, 370 .mode_filter = ata_pci_default_filter,
@@ -400,7 +398,6 @@ static struct ata_port_operations amd66_port_ops = {
400}; 398};
401 399
402static struct ata_port_operations amd100_port_ops = { 400static struct ata_port_operations amd100_port_ops = {
403 .port_disable = ata_port_disable,
404 .set_piomode = amd100_set_piomode, 401 .set_piomode = amd100_set_piomode,
405 .set_dmamode = amd100_set_dmamode, 402 .set_dmamode = amd100_set_dmamode,
406 .mode_filter = ata_pci_default_filter, 403 .mode_filter = ata_pci_default_filter,
@@ -434,7 +431,6 @@ static struct ata_port_operations amd100_port_ops = {
434}; 431};
435 432
436static struct ata_port_operations amd133_port_ops = { 433static struct ata_port_operations amd133_port_ops = {
437 .port_disable = ata_port_disable,
438 .set_piomode = amd133_set_piomode, 434 .set_piomode = amd133_set_piomode,
439 .set_dmamode = amd133_set_dmamode, 435 .set_dmamode = amd133_set_dmamode,
440 .mode_filter = ata_pci_default_filter, 436 .mode_filter = ata_pci_default_filter,
@@ -468,7 +464,6 @@ static struct ata_port_operations amd133_port_ops = {
468}; 464};
469 465
470static struct ata_port_operations nv100_port_ops = { 466static struct ata_port_operations nv100_port_ops = {
471 .port_disable = ata_port_disable,
472 .set_piomode = nv100_set_piomode, 467 .set_piomode = nv100_set_piomode,
473 .set_dmamode = nv100_set_dmamode, 468 .set_dmamode = nv100_set_dmamode,
474 .mode_filter = ata_pci_default_filter, 469 .mode_filter = ata_pci_default_filter,
@@ -502,7 +497,6 @@ static struct ata_port_operations nv100_port_ops = {
502}; 497};
503 498
504static struct ata_port_operations nv133_port_ops = { 499static struct ata_port_operations nv133_port_ops = {
505 .port_disable = ata_port_disable,
506 .set_piomode = nv133_set_piomode, 500 .set_piomode = nv133_set_piomode,
507 .set_dmamode = nv133_set_dmamode, 501 .set_dmamode = nv133_set_dmamode,
508 .mode_filter = ata_pci_default_filter, 502 .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 = {
332}; 332};
333 333
334static const struct ata_port_operations artop6210_ops = { 334static const struct ata_port_operations artop6210_ops = {
335 .port_disable = ata_port_disable,
336 .set_piomode = artop6210_set_piomode, 335 .set_piomode = artop6210_set_piomode,
337 .set_dmamode = artop6210_set_dmamode, 336 .set_dmamode = artop6210_set_dmamode,
338 .mode_filter = ata_pci_default_filter, 337 .mode_filter = ata_pci_default_filter,
@@ -366,7 +365,6 @@ static const struct ata_port_operations artop6210_ops = {
366}; 365};
367 366
368static const struct ata_port_operations artop6260_ops = { 367static const struct ata_port_operations artop6260_ops = {
369 .port_disable = ata_port_disable,
370 .set_piomode = artop6260_set_piomode, 368 .set_piomode = artop6260_set_piomode,
371 .set_dmamode = artop6260_set_dmamode, 369 .set_dmamode = artop6260_set_dmamode,
372 370
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 = {
233}; 233};
234 234
235static struct ata_port_operations atiixp_port_ops = { 235static struct ata_port_operations atiixp_port_ops = {
236 .port_disable = ata_port_disable,
237 .set_piomode = atiixp_set_piomode, 236 .set_piomode = atiixp_set_piomode,
238 .set_dmamode = atiixp_set_dmamode, 237 .set_dmamode = atiixp_set_dmamode,
239 .mode_filter = ata_pci_default_filter, 238 .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 = {
184}; 184};
185 185
186static struct ata_port_operations cmd640_port_ops = { 186static struct ata_port_operations cmd640_port_ops = {
187 .port_disable = ata_port_disable,
188 .set_piomode = cmd640_set_piomode, 187 .set_piomode = cmd640_set_piomode,
189 .mode_filter = ata_pci_default_filter, 188 .mode_filter = ata_pci_default_filter,
190 .tf_load = ata_tf_load, 189 .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 = {
284}; 284};
285 285
286static struct ata_port_operations cmd64x_port_ops = { 286static struct ata_port_operations cmd64x_port_ops = {
287 .port_disable = ata_port_disable,
288 .set_piomode = cmd64x_set_piomode, 287 .set_piomode = cmd64x_set_piomode,
289 .set_dmamode = cmd64x_set_dmamode, 288 .set_dmamode = cmd64x_set_dmamode,
290 .mode_filter = ata_pci_default_filter, 289 .mode_filter = ata_pci_default_filter,
@@ -318,7 +317,6 @@ static struct ata_port_operations cmd64x_port_ops = {
318}; 317};
319 318
320static struct ata_port_operations cmd646r1_port_ops = { 319static struct ata_port_operations cmd646r1_port_ops = {
321 .port_disable = ata_port_disable,
322 .set_piomode = cmd64x_set_piomode, 320 .set_piomode = cmd64x_set_piomode,
323 .set_dmamode = cmd64x_set_dmamode, 321 .set_dmamode = cmd64x_set_dmamode,
324 .mode_filter = ata_pci_default_filter, 322 .mode_filter = ata_pci_default_filter,
@@ -352,7 +350,6 @@ static struct ata_port_operations cmd646r1_port_ops = {
352}; 350};
353 351
354static struct ata_port_operations cmd648_port_ops = { 352static struct ata_port_operations cmd648_port_ops = {
355 .port_disable = ata_port_disable,
356 .set_piomode = cmd64x_set_piomode, 353 .set_piomode = cmd64x_set_piomode,
357 .set_dmamode = cmd64x_set_dmamode, 354 .set_dmamode = cmd64x_set_dmamode,
358 .mode_filter = ata_pci_default_filter, 355 .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 = {
158}; 158};
159 159
160static struct ata_port_operations cs5520_port_ops = { 160static struct ata_port_operations cs5520_port_ops = {
161 .port_disable = ata_port_disable,
162 .set_piomode = cs5520_set_piomode, 161 .set_piomode = cs5520_set_piomode,
163 .set_dmamode = cs5520_set_dmamode, 162 .set_dmamode = cs5520_set_dmamode,
164 163
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 = {
179}; 179};
180 180
181static struct ata_port_operations cs5530_port_ops = { 181static struct ata_port_operations cs5530_port_ops = {
182 .port_disable = ata_port_disable,
183 .set_piomode = cs5530_set_piomode, 182 .set_piomode = cs5530_set_piomode,
184 .set_dmamode = cs5530_set_dmamode, 183 .set_dmamode = cs5530_set_dmamode,
185 .mode_filter = ata_pci_default_filter, 184 .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 = {
176}; 176};
177 177
178static struct ata_port_operations cs5535_port_ops = { 178static struct ata_port_operations cs5535_port_ops = {
179 .port_disable = ata_port_disable,
180 .set_piomode = cs5535_set_piomode, 179 .set_piomode = cs5535_set_piomode,
181 .set_dmamode = cs5535_set_dmamode, 180 .set_dmamode = cs5535_set_dmamode,
182 .mode_filter = ata_pci_default_filter, 181 .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 = {
128}; 128};
129 129
130static struct ata_port_operations cy82c693_port_ops = { 130static struct ata_port_operations cy82c693_port_ops = {
131 .port_disable = ata_port_disable,
132 .set_piomode = cy82c693_set_piomode, 131 .set_piomode = cy82c693_set_piomode,
133 .set_dmamode = cy82c693_set_dmamode, 132 .set_dmamode = cy82c693_set_dmamode,
134 .mode_filter = ata_pci_default_filter, 133 .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 = {
251}; 251};
252 252
253static const struct ata_port_operations efar_ops = { 253static const struct ata_port_operations efar_ops = {
254 .port_disable = ata_port_disable,
255 .set_piomode = efar_set_piomode, 254 .set_piomode = efar_set_piomode,
256 .set_dmamode = efar_set_dmamode, 255 .set_dmamode = efar_set_dmamode,
257 .mode_filter = ata_pci_default_filter, 256 .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 = {
312 */ 312 */
313 313
314static struct ata_port_operations hpt366_port_ops = { 314static struct ata_port_operations hpt366_port_ops = {
315 .port_disable = ata_port_disable,
316 .set_piomode = hpt366_set_piomode, 315 .set_piomode = hpt366_set_piomode,
317 .set_dmamode = hpt366_set_dmamode, 316 .set_dmamode = hpt366_set_dmamode,
318 .mode_filter = hpt366_filter, 317 .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 = {
644 */ 644 */
645 645
646static struct ata_port_operations hpt370_port_ops = { 646static struct ata_port_operations hpt370_port_ops = {
647 .port_disable = ata_port_disable,
648 .set_piomode = hpt370_set_piomode, 647 .set_piomode = hpt370_set_piomode,
649 .set_dmamode = hpt370_set_dmamode, 648 .set_dmamode = hpt370_set_dmamode,
650 .mode_filter = hpt370_filter, 649 .mode_filter = hpt370_filter,
@@ -682,7 +681,6 @@ static struct ata_port_operations hpt370_port_ops = {
682 */ 681 */
683 682
684static struct ata_port_operations hpt370a_port_ops = { 683static struct ata_port_operations hpt370a_port_ops = {
685 .port_disable = ata_port_disable,
686 .set_piomode = hpt370_set_piomode, 684 .set_piomode = hpt370_set_piomode,
687 .set_dmamode = hpt370_set_dmamode, 685 .set_dmamode = hpt370_set_dmamode,
688 .mode_filter = hpt370a_filter, 686 .mode_filter = hpt370a_filter,
@@ -721,7 +719,6 @@ static struct ata_port_operations hpt370a_port_ops = {
721 */ 719 */
722 720
723static struct ata_port_operations hpt372_port_ops = { 721static struct ata_port_operations hpt372_port_ops = {
724 .port_disable = ata_port_disable,
725 .set_piomode = hpt372_set_piomode, 722 .set_piomode = hpt372_set_piomode,
726 .set_dmamode = hpt372_set_dmamode, 723 .set_dmamode = hpt372_set_dmamode,
727 .mode_filter = ata_pci_default_filter, 724 .mode_filter = ata_pci_default_filter,
@@ -760,7 +757,6 @@ static struct ata_port_operations hpt372_port_ops = {
760 */ 757 */
761 758
762static struct ata_port_operations hpt374_port_ops = { 759static struct ata_port_operations hpt374_port_ops = {
763 .port_disable = ata_port_disable,
764 .set_piomode = hpt372_set_piomode, 760 .set_piomode = hpt372_set_piomode,
765 .set_dmamode = hpt372_set_dmamode, 761 .set_dmamode = hpt372_set_dmamode,
766 .mode_filter = ata_pci_default_filter, 762 .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 = {
361 */ 361 */
362 362
363static struct ata_port_operations hpt3x2n_port_ops = { 363static struct ata_port_operations hpt3x2n_port_ops = {
364 .port_disable = ata_port_disable,
365 .set_piomode = hpt3x2n_set_piomode, 364 .set_piomode = hpt3x2n_set_piomode,
366 .set_dmamode = hpt3x2n_set_dmamode, 365 .set_dmamode = hpt3x2n_set_dmamode,
367 .mode_filter = ata_pci_default_filter, 366 .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 = {
120}; 120};
121 121
122static struct ata_port_operations hpt3x3_port_ops = { 122static struct ata_port_operations hpt3x3_port_ops = {
123 .port_disable = ata_port_disable,
124 .set_piomode = hpt3x3_set_piomode, 123 .set_piomode = hpt3x3_set_piomode,
125#if defined(CONFIG_PATA_HPT3X3_DMA) 124#if defined(CONFIG_PATA_HPT3X3_DMA)
126 .set_dmamode = hpt3x3_set_dmamode, 125 .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)
358} 358}
359 359
360static struct ata_port_operations pata_icside_port_ops = { 360static struct ata_port_operations pata_icside_port_ops = {
361 .port_disable = ata_port_disable,
362
363 .set_dmamode = pata_icside_set_dmamode, 361 .set_dmamode = pata_icside_set_dmamode,
364 362
365 .tf_load = ata_tf_load, 363 .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 = {
38}; 38};
39 39
40static struct ata_port_operations isapnp_port_ops = { 40static struct ata_port_operations isapnp_port_ops = {
41 .port_disable = ata_port_disable,
42 .tf_load = ata_tf_load, 41 .tf_load = ata_tf_load,
43 .tf_read = ata_tf_read, 42 .tf_read = ata_tf_read,
44 .check_status = ata_check_status, 43 .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 = {
261}; 261};
262 262
263static const struct ata_port_operations it8213_ops = { 263static const struct ata_port_operations it8213_ops = {
264 .port_disable = ata_port_disable,
265 .set_piomode = it8213_set_piomode, 264 .set_piomode = it8213_set_piomode,
266 .set_dmamode = it8213_set_dmamode, 265 .set_dmamode = it8213_set_dmamode,
267 .mode_filter = ata_pci_default_filter, 266 .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 = {
620 620
621static struct ata_port_operations it821x_smart_port_ops = { 621static struct ata_port_operations it821x_smart_port_ops = {
622 .set_mode = it821x_smart_set_mode, 622 .set_mode = it821x_smart_set_mode,
623 .port_disable = ata_port_disable,
624 .tf_load = ata_tf_load, 623 .tf_load = ata_tf_load,
625 .tf_read = ata_tf_read, 624 .tf_read = ata_tf_read,
626 .mode_filter = ata_pci_default_filter, 625 .mode_filter = ata_pci_default_filter,
@@ -655,7 +654,6 @@ static struct ata_port_operations it821x_smart_port_ops = {
655}; 654};
656 655
657static struct ata_port_operations it821x_passthru_port_ops = { 656static struct ata_port_operations it821x_passthru_port_ops = {
658 .port_disable = ata_port_disable,
659 .set_piomode = it821x_passthru_set_piomode, 657 .set_piomode = it821x_passthru_set_piomode,
660 .set_dmamode = it821x_passthru_set_dmamode, 658 .set_dmamode = it821x_passthru_set_dmamode,
661 .mode_filter = ata_pci_default_filter, 659 .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 = {
107 .set_mode = ixp4xx_set_mode, 107 .set_mode = ixp4xx_set_mode,
108 .mode_filter = ata_pci_default_filter, 108 .mode_filter = ata_pci_default_filter,
109 109
110 .port_disable = ata_port_disable,
111 .tf_load = ata_tf_load, 110 .tf_load = ata_tf_load,
112 .tf_read = ata_tf_read, 111 .tf_read = ata_tf_read,
113 .exec_command = ata_exec_command, 112 .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 = {
141}; 141};
142 142
143static const struct ata_port_operations jmicron_ops = { 143static const struct ata_port_operations jmicron_ops = {
144 .port_disable = ata_port_disable,
145
146 /* Task file is PCI ATA format, use helpers */ 144 /* Task file is PCI ATA format, use helpers */
147 .tf_load = ata_tf_load, 145 .tf_load = ata_tf_load,
148 .tf_read = ata_tf_read, 146 .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 = {
150 */ 150 */
151 151
152static struct ata_port_operations simple_port_ops = { 152static struct ata_port_operations simple_port_ops = {
153 .port_disable = ata_port_disable,
154 .tf_load = ata_tf_load, 153 .tf_load = ata_tf_load,
155 .tf_read = ata_tf_read, 154 .tf_read = ata_tf_read,
156 .check_status = ata_check_status, 155 .check_status = ata_check_status,
@@ -178,7 +177,6 @@ static struct ata_port_operations simple_port_ops = {
178static struct ata_port_operations legacy_port_ops = { 177static struct ata_port_operations legacy_port_ops = {
179 .set_mode = legacy_set_mode, 178 .set_mode = legacy_set_mode,
180 179
181 .port_disable = ata_port_disable,
182 .tf_load = ata_tf_load, 180 .tf_load = ata_tf_load,
183 .tf_read = ata_tf_read, 181 .tf_read = ata_tf_read,
184 .check_status = ata_check_status, 182 .check_status = ata_check_status,
@@ -293,7 +291,6 @@ static void pdc_data_xfer_vlb(struct ata_device *adev, unsigned char *buf, unsig
293static struct ata_port_operations pdc20230_port_ops = { 291static struct ata_port_operations pdc20230_port_ops = {
294 .set_piomode = pdc20230_set_piomode, 292 .set_piomode = pdc20230_set_piomode,
295 293
296 .port_disable = ata_port_disable,
297 .tf_load = ata_tf_load, 294 .tf_load = ata_tf_load,
298 .tf_read = ata_tf_read, 295 .tf_read = ata_tf_read,
299 .check_status = ata_check_status, 296 .check_status = ata_check_status,
@@ -348,7 +345,6 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
348static struct ata_port_operations ht6560a_port_ops = { 345static struct ata_port_operations ht6560a_port_ops = {
349 .set_piomode = ht6560a_set_piomode, 346 .set_piomode = ht6560a_set_piomode,
350 347
351 .port_disable = ata_port_disable,
352 .tf_load = ata_tf_load, 348 .tf_load = ata_tf_load,
353 .tf_read = ata_tf_read, 349 .tf_read = ata_tf_read,
354 .check_status = ata_check_status, 350 .check_status = ata_check_status,
@@ -414,7 +410,6 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
414static struct ata_port_operations ht6560b_port_ops = { 410static struct ata_port_operations ht6560b_port_ops = {
415 .set_piomode = ht6560b_set_piomode, 411 .set_piomode = ht6560b_set_piomode,
416 412
417 .port_disable = ata_port_disable,
418 .tf_load = ata_tf_load, 413 .tf_load = ata_tf_load,
419 .tf_read = ata_tf_read, 414 .tf_read = ata_tf_read,
420 .check_status = ata_check_status, 415 .check_status = ata_check_status,
@@ -535,7 +530,6 @@ static void opti82c611a_set_piomode(struct ata_port *ap, struct ata_device *adev
535static struct ata_port_operations opti82c611a_port_ops = { 530static struct ata_port_operations opti82c611a_port_ops = {
536 .set_piomode = opti82c611a_set_piomode, 531 .set_piomode = opti82c611a_set_piomode,
537 532
538 .port_disable = ata_port_disable,
539 .tf_load = ata_tf_load, 533 .tf_load = ata_tf_load,
540 .tf_read = ata_tf_read, 534 .tf_read = ata_tf_read,
541 .check_status = ata_check_status, 535 .check_status = ata_check_status,
@@ -668,7 +662,6 @@ static unsigned int opti82c46x_qc_issue_prot(struct ata_queued_cmd *qc)
668static struct ata_port_operations opti82c46x_port_ops = { 662static struct ata_port_operations opti82c46x_port_ops = {
669 .set_piomode = opti82c46x_set_piomode, 663 .set_piomode = opti82c46x_set_piomode,
670 664
671 .port_disable = ata_port_disable,
672 .tf_load = ata_tf_load, 665 .tf_load = ata_tf_load,
673 .tf_read = ata_tf_read, 666 .tf_read = ata_tf_read,
674 .check_status = ata_check_status, 667 .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 = {
111}; 111};
112 112
113static const struct ata_port_operations marvell_ops = { 113static const struct ata_port_operations marvell_ops = {
114 .port_disable = ata_port_disable,
115
116 /* Task file is PCI ATA format, use helpers */ 114 /* Task file is PCI ATA format, use helpers */
117 .tf_load = ata_tf_load, 115 .tf_load = ata_tf_load,
118 .tf_read = ata_tf_read, 116 .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 = {
283}; 283};
284 284
285static struct ata_port_operations mpc52xx_ata_port_ops = { 285static struct ata_port_operations mpc52xx_ata_port_ops = {
286 .port_disable = ata_port_disable,
287 .set_piomode = mpc52xx_ata_set_piomode, 286 .set_piomode = mpc52xx_ata_set_piomode,
288 .dev_select = mpc52xx_ata_dev_select, 287 .dev_select = mpc52xx_ata_dev_select,
289 .tf_load = ata_tf_load, 288 .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 = {
169}; 169};
170 170
171static struct ata_port_operations mpiix_port_ops = { 171static struct ata_port_operations mpiix_port_ops = {
172 .port_disable = ata_port_disable,
173 .set_piomode = mpiix_set_piomode, 172 .set_piomode = mpiix_set_piomode,
174 173
175 .tf_load = ata_tf_load, 174 .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 = {
40}; 40};
41 41
42static const struct ata_port_operations netcell_ops = { 42static const struct ata_port_operations netcell_ops = {
43 .port_disable = ata_port_disable,
44
45 /* Task file is PCI ATA format, use helpers */ 43 /* Task file is PCI ATA format, use helpers */
46 .tf_load = ata_tf_load, 44 .tf_load = ata_tf_load,
47 .tf_read = ata_tf_read, 45 .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 = {
162}; 162};
163 163
164static struct ata_port_operations ns87410_port_ops = { 164static struct ata_port_operations ns87410_port_ops = {
165 .port_disable = ata_port_disable,
166 .set_piomode = ns87410_set_piomode, 165 .set_piomode = ns87410_set_piomode,
167 166
168 .tf_load = ata_tf_load, 167 .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 = {
238}; 238};
239 239
240static const struct ata_port_operations oldpiix_pata_ops = { 240static const struct ata_port_operations oldpiix_pata_ops = {
241 .port_disable = ata_port_disable,
242 .set_piomode = oldpiix_set_piomode, 241 .set_piomode = oldpiix_set_piomode,
243 .set_dmamode = oldpiix_set_dmamode, 242 .set_dmamode = oldpiix_set_dmamode,
244 .mode_filter = ata_pci_default_filter, 243 .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 = {
183}; 183};
184 184
185static struct ata_port_operations opti_port_ops = { 185static struct ata_port_operations opti_port_ops = {
186 .port_disable = ata_port_disable,
187 .set_piomode = opti_set_piomode, 186 .set_piomode = opti_set_piomode,
188 .tf_load = ata_tf_load, 187 .tf_load = ata_tf_load,
189 .tf_read = ata_tf_read, 188 .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 = {
368}; 368};
369 369
370static struct ata_port_operations optidma_port_ops = { 370static struct ata_port_operations optidma_port_ops = {
371 .port_disable = ata_port_disable,
372 .set_piomode = optidma_set_pio_mode, 371 .set_piomode = optidma_set_pio_mode,
373 .set_dmamode = optidma_set_dma_mode, 372 .set_dmamode = optidma_set_dma_mode,
374 373
@@ -403,7 +402,6 @@ static struct ata_port_operations optidma_port_ops = {
403}; 402};
404 403
405static struct ata_port_operations optiplus_port_ops = { 404static struct ata_port_operations optiplus_port_ops = {
406 .port_disable = ata_port_disable,
407 .set_piomode = optiplus_set_pio_mode, 405 .set_piomode = optiplus_set_pio_mode,
408 .set_dmamode = optiplus_set_dma_mode, 406 .set_dmamode = optiplus_set_dma_mode,
409 407
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 = {
107 107
108static struct ata_port_operations pcmcia_port_ops = { 108static struct ata_port_operations pcmcia_port_ops = {
109 .set_mode = pcmcia_set_mode, 109 .set_mode = pcmcia_set_mode,
110 .port_disable = ata_port_disable,
111 .tf_load = ata_tf_load, 110 .tf_load = ata_tf_load,
112 .tf_read = ata_tf_read, 111 .tf_read = ata_tf_read,
113 .check_status = ata_check_status, 112 .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 = {
147}; 147};
148 148
149static struct ata_port_operations pdc2027x_pata100_ops = { 149static struct ata_port_operations pdc2027x_pata100_ops = {
150 .port_disable = ata_port_disable,
151 .mode_filter = ata_pci_default_filter, 150 .mode_filter = ata_pci_default_filter,
152 151
153 .tf_load = ata_tf_load, 152 .tf_load = ata_tf_load,
@@ -178,7 +177,6 @@ static struct ata_port_operations pdc2027x_pata100_ops = {
178}; 177};
179 178
180static struct ata_port_operations pdc2027x_pata133_ops = { 179static struct ata_port_operations pdc2027x_pata133_ops = {
181 .port_disable = ata_port_disable,
182 .set_piomode = pdc2027x_set_piomode, 180 .set_piomode = pdc2027x_set_piomode,
183 .set_dmamode = pdc2027x_set_dmamode, 181 .set_dmamode = pdc2027x_set_dmamode,
184 .set_mode = pdc2027x_set_mode, 182 .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 = {
247}; 247};
248 248
249static struct ata_port_operations pdc2024x_port_ops = { 249static struct ata_port_operations pdc2024x_port_ops = {
250 .port_disable = ata_port_disable,
251 .set_piomode = pdc202xx_set_piomode, 250 .set_piomode = pdc202xx_set_piomode,
252 .set_dmamode = pdc202xx_set_dmamode, 251 .set_dmamode = pdc202xx_set_dmamode,
253 .mode_filter = ata_pci_default_filter, 252 .mode_filter = ata_pci_default_filter,
@@ -280,7 +279,6 @@ static struct ata_port_operations pdc2024x_port_ops = {
280}; 279};
281 280
282static struct ata_port_operations pdc2026x_port_ops = { 281static struct ata_port_operations pdc2026x_port_ops = {
283 .port_disable = ata_port_disable,
284 .set_piomode = pdc202xx_set_piomode, 282 .set_piomode = pdc202xx_set_piomode,
285 .set_dmamode = pdc202xx_set_dmamode, 283 .set_dmamode = pdc202xx_set_dmamode,
286 .mode_filter = ata_pci_default_filter, 284 .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 = {
69static struct ata_port_operations pata_platform_port_ops = { 69static struct ata_port_operations pata_platform_port_ops = {
70 .set_mode = pata_platform_set_mode, 70 .set_mode = pata_platform_set_mode,
71 71
72 .port_disable = ata_port_disable,
73 .tf_load = ata_tf_load, 72 .tf_load = ata_tf_load,
74 .tf_read = ata_tf_read, 73 .tf_read = ata_tf_read,
75 .check_status = ata_check_status, 74 .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 = {
170}; 170};
171 171
172static struct ata_port_operations qdi6500_port_ops = { 172static struct ata_port_operations qdi6500_port_ops = {
173 .port_disable = ata_port_disable,
174 .set_piomode = qdi6500_set_piomode, 173 .set_piomode = qdi6500_set_piomode,
175 174
176 .tf_load = ata_tf_load, 175 .tf_load = ata_tf_load,
@@ -197,7 +196,6 @@ static struct ata_port_operations qdi6500_port_ops = {
197}; 196};
198 197
199static struct ata_port_operations qdi6580_port_ops = { 198static struct ata_port_operations qdi6580_port_ops = {
200 .port_disable = ata_port_disable,
201 .set_piomode = qdi6580_set_piomode, 199 .set_piomode = qdi6580_set_piomode,
202 200
203 .tf_load = ata_tf_load, 201 .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 = {
203}; 203};
204 204
205static const struct ata_port_operations radisys_pata_ops = { 205static const struct ata_port_operations radisys_pata_ops = {
206 .port_disable = ata_port_disable,
207 .set_piomode = radisys_set_piomode, 206 .set_piomode = radisys_set_piomode,
208 .set_dmamode = radisys_set_dmamode, 207 .set_dmamode = radisys_set_dmamode,
209 .mode_filter = ata_pci_default_filter, 208 .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 = {
73static struct ata_port_operations rz1000_port_ops = { 73static struct ata_port_operations rz1000_port_ops = {
74 .set_mode = rz1000_set_mode, 74 .set_mode = rz1000_set_mode,
75 75
76 .port_disable = ata_port_disable,
77 .tf_load = ata_tf_load, 76 .tf_load = ata_tf_load,
78 .tf_read = ata_tf_read, 77 .tf_read = ata_tf_read,
79 .check_status = ata_check_status, 78 .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 = {
197}; 197};
198 198
199static struct ata_port_operations sc1200_port_ops = { 199static struct ata_port_operations sc1200_port_ops = {
200 .port_disable = ata_port_disable,
201 .set_piomode = sc1200_set_piomode, 200 .set_piomode = sc1200_set_piomode,
202 .set_dmamode = sc1200_set_dmamode, 201 .set_dmamode = sc1200_set_dmamode,
203 .mode_filter = ata_pci_default_filter, 202 .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 = {
988}; 988};
989 989
990static const struct ata_port_operations scc_pata_ops = { 990static const struct ata_port_operations scc_pata_ops = {
991 .port_disable = ata_port_disable,
992 .set_piomode = scc_set_piomode, 991 .set_piomode = scc_set_piomode,
993 .set_dmamode = scc_set_dmamode, 992 .set_dmamode = scc_set_dmamode,
994 .mode_filter = scc_mode_filter, 993 .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 = {
318}; 318};
319 319
320static struct ata_port_operations serverworks_osb4_port_ops = { 320static struct ata_port_operations serverworks_osb4_port_ops = {
321 .port_disable = ata_port_disable,
322 .set_piomode = serverworks_set_piomode, 321 .set_piomode = serverworks_set_piomode,
323 .set_dmamode = serverworks_set_dmamode, 322 .set_dmamode = serverworks_set_dmamode,
324 .mode_filter = serverworks_osb4_filter, 323 .mode_filter = serverworks_osb4_filter,
@@ -353,7 +352,6 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
353}; 352};
354 353
355static struct ata_port_operations serverworks_csb_port_ops = { 354static struct ata_port_operations serverworks_csb_port_ops = {
356 .port_disable = ata_port_disable,
357 .set_piomode = serverworks_set_piomode, 355 .set_piomode = serverworks_set_piomode,
358 .set_dmamode = serverworks_set_dmamode, 356 .set_dmamode = serverworks_set_dmamode,
359 .mode_filter = serverworks_csb_filter, 357 .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 = {
238}; 238};
239 239
240static struct ata_port_operations sil680_port_ops = { 240static struct ata_port_operations sil680_port_ops = {
241 .port_disable = ata_port_disable,
242 .set_piomode = sil680_set_piomode, 241 .set_piomode = sil680_set_piomode,
243 .set_dmamode = sil680_set_dmamode, 242 .set_dmamode = sil680_set_dmamode,
244 .mode_filter = ata_pci_default_filter, 243 .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 = {
531}; 531};
532 532
533static const struct ata_port_operations sis_133_ops = { 533static const struct ata_port_operations sis_133_ops = {
534 .port_disable = ata_port_disable,
535 .set_piomode = sis_133_set_piomode, 534 .set_piomode = sis_133_set_piomode,
536 .set_dmamode = sis_133_set_dmamode, 535 .set_dmamode = sis_133_set_dmamode,
537 .mode_filter = ata_pci_default_filter, 536 .mode_filter = ata_pci_default_filter,
@@ -564,7 +563,6 @@ static const struct ata_port_operations sis_133_ops = {
564}; 563};
565 564
566static const struct ata_port_operations sis_133_for_sata_ops = { 565static const struct ata_port_operations sis_133_for_sata_ops = {
567 .port_disable = ata_port_disable,
568 .set_piomode = sis_133_set_piomode, 566 .set_piomode = sis_133_set_piomode,
569 .set_dmamode = sis_133_set_dmamode, 567 .set_dmamode = sis_133_set_dmamode,
570 .mode_filter = ata_pci_default_filter, 568 .mode_filter = ata_pci_default_filter,
@@ -597,7 +595,6 @@ static const struct ata_port_operations sis_133_for_sata_ops = {
597}; 595};
598 596
599static const struct ata_port_operations sis_133_early_ops = { 597static const struct ata_port_operations sis_133_early_ops = {
600 .port_disable = ata_port_disable,
601 .set_piomode = sis_100_set_piomode, 598 .set_piomode = sis_100_set_piomode,
602 .set_dmamode = sis_133_early_set_dmamode, 599 .set_dmamode = sis_133_early_set_dmamode,
603 .mode_filter = ata_pci_default_filter, 600 .mode_filter = ata_pci_default_filter,
@@ -630,7 +627,6 @@ static const struct ata_port_operations sis_133_early_ops = {
630}; 627};
631 628
632static const struct ata_port_operations sis_100_ops = { 629static const struct ata_port_operations sis_100_ops = {
633 .port_disable = ata_port_disable,
634 .set_piomode = sis_100_set_piomode, 630 .set_piomode = sis_100_set_piomode,
635 .set_dmamode = sis_100_set_dmamode, 631 .set_dmamode = sis_100_set_dmamode,
636 .mode_filter = ata_pci_default_filter, 632 .mode_filter = ata_pci_default_filter,
@@ -663,7 +659,6 @@ static const struct ata_port_operations sis_100_ops = {
663}; 659};
664 660
665static const struct ata_port_operations sis_66_ops = { 661static const struct ata_port_operations sis_66_ops = {
666 .port_disable = ata_port_disable,
667 .set_piomode = sis_old_set_piomode, 662 .set_piomode = sis_old_set_piomode,
668 .set_dmamode = sis_66_set_dmamode, 663 .set_dmamode = sis_66_set_dmamode,
669 .mode_filter = ata_pci_default_filter, 664 .mode_filter = ata_pci_default_filter,
@@ -696,7 +691,6 @@ static const struct ata_port_operations sis_66_ops = {
696}; 691};
697 692
698static const struct ata_port_operations sis_old_ops = { 693static const struct ata_port_operations sis_old_ops = {
699 .port_disable = ata_port_disable,
700 .set_piomode = sis_old_set_piomode, 694 .set_piomode = sis_old_set_piomode,
701 .set_dmamode = sis_old_set_dmamode, 695 .set_dmamode = sis_old_set_dmamode,
702 .mode_filter = ata_pci_default_filter, 696 .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 = {
225}; 225};
226 226
227static struct ata_port_operations sl82c105_port_ops = { 227static struct ata_port_operations sl82c105_port_ops = {
228 .port_disable = ata_port_disable,
229 .set_piomode = sl82c105_set_piomode, 228 .set_piomode = sl82c105_set_piomode,
230 .mode_filter = ata_pci_default_filter, 229 .mode_filter = ata_pci_default_filter,
231 230
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 = {
198}; 198};
199 199
200static struct ata_port_operations triflex_port_ops = { 200static struct ata_port_operations triflex_port_ops = {
201 .port_disable = ata_port_disable,
202 .set_piomode = triflex_set_piomode, 201 .set_piomode = triflex_set_piomode,
203 .mode_filter = ata_pci_default_filter, 202 .mode_filter = ata_pci_default_filter,
204 203
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 = {
348}; 348};
349 349
350static struct ata_port_operations via_port_ops = { 350static struct ata_port_operations via_port_ops = {
351 .port_disable = ata_port_disable,
352 .set_piomode = via_set_piomode, 351 .set_piomode = via_set_piomode,
353 .set_dmamode = via_set_dmamode, 352 .set_dmamode = via_set_dmamode,
354 .mode_filter = ata_pci_default_filter, 353 .mode_filter = ata_pci_default_filter,
@@ -383,7 +382,6 @@ static struct ata_port_operations via_port_ops = {
383}; 382};
384 383
385static struct ata_port_operations via_port_ops_noirq = { 384static struct ata_port_operations via_port_ops_noirq = {
386 .port_disable = ata_port_disable,
387 .set_piomode = via_set_piomode, 385 .set_piomode = via_set_piomode,
388 .set_dmamode = via_set_dmamode, 386 .set_dmamode = via_set_dmamode,
389 .mode_filter = ata_pci_default_filter, 387 .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 = {
138}; 138};
139 139
140static struct ata_port_operations winbond_port_ops = { 140static struct ata_port_operations winbond_port_ops = {
141 .port_disable = ata_port_disable,
142 .set_piomode = winbond_set_piomode, 141 .set_piomode = winbond_set_piomode,
143 142
144 .tf_load = ata_tf_load, 143 .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 = {
162}; 162};
163 163
164static const struct ata_port_operations adma_ata_ops = { 164static const struct ata_port_operations adma_ata_ops = {
165 .port_disable = ata_port_disable,
166 .tf_load = ata_tf_load, 165 .tf_load = ata_tf_load,
167 .tf_read = ata_tf_read, 166 .tf_read = ata_tf_read,
168 .exec_command = ata_exec_command, 167 .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)
552} 552}
553 553
554static struct ata_port_operations inic_port_ops = { 554static struct ata_port_operations inic_port_ops = {
555 .port_disable = ata_port_disable,
556 .tf_load = ata_tf_load, 555 .tf_load = ata_tf_load,
557 .tf_read = ata_tf_read, 556 .tf_read = ata_tf_read,
558 .check_status = ata_check_status, 557 .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 = {
483}; 483};
484 484
485static const struct ata_port_operations mv5_ops = { 485static const struct ata_port_operations mv5_ops = {
486 .port_disable = ata_port_disable,
487
488 .tf_load = ata_tf_load, 486 .tf_load = ata_tf_load,
489 .tf_read = ata_tf_read, 487 .tf_read = ata_tf_read,
490 .check_status = ata_check_status, 488 .check_status = ata_check_status,
@@ -513,8 +511,6 @@ static const struct ata_port_operations mv5_ops = {
513}; 511};
514 512
515static const struct ata_port_operations mv6_ops = { 513static const struct ata_port_operations mv6_ops = {
516 .port_disable = ata_port_disable,
517
518 .tf_load = ata_tf_load, 514 .tf_load = ata_tf_load,
519 .tf_read = ata_tf_read, 515 .tf_read = ata_tf_read,
520 .check_status = ata_check_status, 516 .check_status = ata_check_status,
@@ -543,8 +539,6 @@ static const struct ata_port_operations mv6_ops = {
543}; 539};
544 540
545static const struct ata_port_operations mv_iie_ops = { 541static const struct ata_port_operations mv_iie_ops = {
546 .port_disable = ata_port_disable,
547
548 .tf_load = ata_tf_load, 542 .tf_load = ata_tf_load,
549 .tf_read = ata_tf_read, 543 .tf_read = ata_tf_read,
550 .check_status = ata_check_status, 544 .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 = {
340}; 340};
341 341
342static const struct ata_port_operations nv_generic_ops = { 342static const struct ata_port_operations nv_generic_ops = {
343 .port_disable = ata_port_disable,
344 .tf_load = ata_tf_load, 343 .tf_load = ata_tf_load,
345 .tf_read = ata_tf_read, 344 .tf_read = ata_tf_read,
346 .exec_command = ata_exec_command, 345 .exec_command = ata_exec_command,
@@ -365,7 +364,6 @@ static const struct ata_port_operations nv_generic_ops = {
365}; 364};
366 365
367static const struct ata_port_operations nv_nf2_ops = { 366static const struct ata_port_operations nv_nf2_ops = {
368 .port_disable = ata_port_disable,
369 .tf_load = ata_tf_load, 367 .tf_load = ata_tf_load,
370 .tf_read = ata_tf_read, 368 .tf_read = ata_tf_read,
371 .exec_command = ata_exec_command, 369 .exec_command = ata_exec_command,
@@ -390,7 +388,6 @@ static const struct ata_port_operations nv_nf2_ops = {
390}; 388};
391 389
392static const struct ata_port_operations nv_ck804_ops = { 390static const struct ata_port_operations nv_ck804_ops = {
393 .port_disable = ata_port_disable,
394 .tf_load = ata_tf_load, 391 .tf_load = ata_tf_load,
395 .tf_read = ata_tf_read, 392 .tf_read = ata_tf_read,
396 .exec_command = ata_exec_command, 393 .exec_command = ata_exec_command,
@@ -416,7 +413,6 @@ static const struct ata_port_operations nv_ck804_ops = {
416}; 413};
417 414
418static const struct ata_port_operations nv_adma_ops = { 415static const struct ata_port_operations nv_adma_ops = {
419 .port_disable = ata_port_disable,
420 .tf_load = ata_tf_load, 416 .tf_load = ata_tf_load,
421 .tf_read = nv_adma_tf_read, 417 .tf_read = nv_adma_tf_read,
422 .check_atapi_dma = nv_adma_check_atapi_dma, 418 .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 = {
167}; 167};
168 168
169static const struct ata_port_operations pdc_sata_ops = { 169static const struct ata_port_operations pdc_sata_ops = {
170 .port_disable = ata_port_disable,
171 .tf_load = pdc_tf_load_mmio, 170 .tf_load = pdc_tf_load_mmio,
172 .tf_read = ata_tf_read, 171 .tf_read = ata_tf_read,
173 .check_status = ata_check_status, 172 .check_status = ata_check_status,
@@ -193,7 +192,6 @@ static const struct ata_port_operations pdc_sata_ops = {
193 192
194/* First-generation chips need a more restrictive ->check_atapi_dma op */ 193/* First-generation chips need a more restrictive ->check_atapi_dma op */
195static const struct ata_port_operations pdc_old_sata_ops = { 194static const struct ata_port_operations pdc_old_sata_ops = {
196 .port_disable = ata_port_disable,
197 .tf_load = pdc_tf_load_mmio, 195 .tf_load = pdc_tf_load_mmio,
198 .tf_read = ata_tf_read, 196 .tf_read = ata_tf_read,
199 .check_status = ata_check_status, 197 .check_status = ata_check_status,
@@ -218,7 +216,6 @@ static const struct ata_port_operations pdc_old_sata_ops = {
218}; 216};
219 217
220static const struct ata_port_operations pdc_pata_ops = { 218static const struct ata_port_operations pdc_pata_ops = {
221 .port_disable = ata_port_disable,
222 .tf_load = pdc_tf_load_mmio, 219 .tf_load = pdc_tf_load_mmio,
223 .tf_read = ata_tf_read, 220 .tf_read = ata_tf_read,
224 .check_status = ata_check_status, 221 .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 = {
145}; 145};
146 146
147static const struct ata_port_operations qs_ata_ops = { 147static const struct ata_port_operations qs_ata_ops = {
148 .port_disable = ata_port_disable,
149 .tf_load = ata_tf_load, 148 .tf_load = ata_tf_load,
150 .tf_read = ata_tf_read, 149 .tf_read = ata_tf_read,
151 .check_status = ata_check_status, 150 .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 = {
186}; 186};
187 187
188static const struct ata_port_operations sil_ops = { 188static const struct ata_port_operations sil_ops = {
189 .port_disable = ata_port_disable,
190 .dev_config = sil_dev_config, 189 .dev_config = sil_dev_config,
191 .tf_load = ata_tf_load, 190 .tf_load = ata_tf_load,
192 .tf_read = ata_tf_read, 191 .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 = {
384}; 384};
385 385
386static const struct ata_port_operations sil24_ops = { 386static const struct ata_port_operations sil24_ops = {
387 .port_disable = ata_port_disable,
388
389 .dev_config = sil24_dev_config, 387 .dev_config = sil24_dev_config,
390 388
391 .check_status = sil24_check_status, 389 .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 = {
104}; 104};
105 105
106static const struct ata_port_operations sis_ops = { 106static const struct ata_port_operations sis_ops = {
107 .port_disable = ata_port_disable,
108 .tf_load = ata_tf_load, 107 .tf_load = ata_tf_load,
109 .tf_read = ata_tf_read, 108 .tf_read = ata_tf_read,
110 .check_status = ata_check_status, 109 .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 = {
329 329
330 330
331static const struct ata_port_operations k2_sata_ops = { 331static const struct ata_port_operations k2_sata_ops = {
332 .port_disable = ata_port_disable,
333 .tf_load = k2_sata_tf_load, 332 .tf_load = k2_sata_tf_load,
334 .tf_read = k2_sata_tf_read, 333 .tf_read = k2_sata_tf_read,
335 .check_status = k2_stat_check_status, 334 .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 = {
254}; 254};
255 255
256static const struct ata_port_operations pdc_20621_ops = { 256static const struct ata_port_operations pdc_20621_ops = {
257 .port_disable = ata_port_disable,
258 .tf_load = pdc_tf_load_mmio, 257 .tf_load = pdc_tf_load_mmio,
259 .tf_read = ata_tf_read, 258 .tf_read = ata_tf_read,
260 .check_status = ata_check_status, 259 .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 = {
94}; 94};
95 95
96static const struct ata_port_operations uli_ops = { 96static const struct ata_port_operations uli_ops = {
97 .port_disable = ata_port_disable,
98
99 .tf_load = ata_tf_load, 97 .tf_load = ata_tf_load,
100 .tf_read = ata_tf_read, 98 .tf_read = ata_tf_read,
101 .check_status = ata_check_status, 99 .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 = {
122}; 122};
123 123
124static const struct ata_port_operations vt6420_sata_ops = { 124static const struct ata_port_operations vt6420_sata_ops = {
125 .port_disable = ata_port_disable,
126
127 .tf_load = ata_tf_load, 125 .tf_load = ata_tf_load,
128 .tf_read = ata_tf_read, 126 .tf_read = ata_tf_read,
129 .check_status = ata_check_status, 127 .check_status = ata_check_status,
@@ -151,8 +149,6 @@ static const struct ata_port_operations vt6420_sata_ops = {
151}; 149};
152 150
153static const struct ata_port_operations vt6421_pata_ops = { 151static const struct ata_port_operations vt6421_pata_ops = {
154 .port_disable = ata_port_disable,
155
156 .set_piomode = vt6421_set_pio_mode, 152 .set_piomode = vt6421_set_pio_mode,
157 .set_dmamode = vt6421_set_dma_mode, 153 .set_dmamode = vt6421_set_dma_mode,
158 154
@@ -184,8 +180,6 @@ static const struct ata_port_operations vt6421_pata_ops = {
184}; 180};
185 181
186static const struct ata_port_operations vt6421_sata_ops = { 182static const struct ata_port_operations vt6421_sata_ops = {
187 .port_disable = ata_port_disable,
188
189 .tf_load = ata_tf_load, 183 .tf_load = ata_tf_load,
190 .tf_read = ata_tf_read, 184 .tf_read = ata_tf_read,
191 .check_status = ata_check_status, 185 .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 = {
317 317
318 318
319static const struct ata_port_operations vsc_sata_ops = { 319static const struct ata_port_operations vsc_sata_ops = {
320 .port_disable = ata_port_disable,
321 .tf_load = vsc_sata_tf_load, 320 .tf_load = vsc_sata_tf_load,
322 .tf_read = vsc_sata_tf_read, 321 .tf_read = vsc_sata_tf_read,
323 .exec_command = ata_exec_command, 322 .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)
4981 rc = ipr_device_reset(ioa_cfg, res); 4981 rc = ipr_device_reset(ioa_cfg, res);
4982 4982
4983 if (rc) { 4983 if (rc) {
4984 ap->ops->port_disable(ap); 4984 ata_port_disable(ap);
4985 goto out_unlock; 4985 goto out_unlock;
4986 } 4986 }
4987 4987
@@ -4996,7 +4996,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
4996 break; 4996 break;
4997 default: 4997 default:
4998 ap->link.device[0].class = ATA_DEV_UNKNOWN; 4998 ap->link.device[0].class = ATA_DEV_UNKNOWN;
4999 ap->ops->port_disable(ap); 4999 ata_port_disable(ap);
5000 break; 5000 break;
5001 }; 5001 };
5002 5002
@@ -5262,7 +5262,6 @@ static u8 ipr_ata_check_altstatus(struct ata_port *ap)
5262} 5262}
5263 5263
5264static struct ata_port_operations ipr_sata_ops = { 5264static struct ata_port_operations ipr_sata_ops = {
5265 .port_disable = ata_port_disable,
5266 .check_status = ipr_ata_check_status, 5265 .check_status = ipr_ata_check_status,
5267 .check_altstatus = ipr_ata_check_altstatus, 5266 .check_altstatus = ipr_ata_check_altstatus,
5268 .dev_select = ata_noop_dev_select, 5267 .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,
350} 350}
351 351
352static struct ata_port_operations sas_sata_ops = { 352static struct ata_port_operations sas_sata_ops = {
353 .port_disable = ata_port_disable,
354 .check_status = sas_ata_check_status, 353 .check_status = sas_ata_check_status,
355 .check_altstatus = sas_ata_check_status, 354 .check_altstatus = sas_ata_check_status,
356 .dev_select = ata_noop_dev_select, 355 .dev_select = ata_noop_dev_select,
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 382898ef6545..e7d163edb4c0 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -600,8 +600,6 @@ struct ata_port {
600}; 600};
601 601
602struct ata_port_operations { 602struct ata_port_operations {
603 void (*port_disable) (struct ata_port *);
604
605 void (*dev_config) (struct ata_device *); 603 void (*dev_config) (struct ata_device *);
606 604
607 void (*set_piomode) (struct ata_port *, struct ata_device *); 605 void (*set_piomode) (struct ata_port *, struct ata_device *);