aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_ali.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_ali.c')
-rw-r--r--drivers/ata/pata_ali.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 32a10c99c06f..364534e7aff4 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,
@@ -327,9 +326,8 @@ static struct ata_port_operations ali_early_port_ops = {
327 .irq_handler = ata_interrupt, 326 .irq_handler = ata_interrupt,
328 .irq_clear = ata_bmdma_irq_clear, 327 .irq_clear = ata_bmdma_irq_clear,
329 .irq_on = ata_irq_on, 328 .irq_on = ata_irq_on,
330 .irq_ack = ata_irq_ack,
331 329
332 .port_start = ata_port_start, 330 .port_start = ata_sff_port_start,
333}; 331};
334 332
335/* 333/*
@@ -337,8 +335,6 @@ static struct ata_port_operations ali_early_port_ops = {
337 * detect 335 * detect
338 */ 336 */
339static struct ata_port_operations ali_20_port_ops = { 337static struct ata_port_operations ali_20_port_ops = {
340 .port_disable = ata_port_disable,
341
342 .set_piomode = ali_set_piomode, 338 .set_piomode = ali_set_piomode,
343 .set_dmamode = ali_set_dmamode, 339 .set_dmamode = ali_set_dmamode,
344 .mode_filter = ali_20_filter, 340 .mode_filter = ali_20_filter,
@@ -369,16 +365,14 @@ static struct ata_port_operations ali_20_port_ops = {
369 .irq_handler = ata_interrupt, 365 .irq_handler = ata_interrupt,
370 .irq_clear = ata_bmdma_irq_clear, 366 .irq_clear = ata_bmdma_irq_clear,
371 .irq_on = ata_irq_on, 367 .irq_on = ata_irq_on,
372 .irq_ack = ata_irq_ack,
373 368
374 .port_start = ata_port_start, 369 .port_start = ata_sff_port_start,
375}; 370};
376 371
377/* 372/*
378 * Port operations for DMA capable ALi with cable detect 373 * Port operations for DMA capable ALi with cable detect
379 */ 374 */
380static struct ata_port_operations ali_c2_port_ops = { 375static struct ata_port_operations ali_c2_port_ops = {
381 .port_disable = ata_port_disable,
382 .set_piomode = ali_set_piomode, 376 .set_piomode = ali_set_piomode,
383 .set_dmamode = ali_set_dmamode, 377 .set_dmamode = ali_set_dmamode,
384 .mode_filter = ata_pci_default_filter, 378 .mode_filter = ata_pci_default_filter,
@@ -408,16 +402,14 @@ static struct ata_port_operations ali_c2_port_ops = {
408 .irq_handler = ata_interrupt, 402 .irq_handler = ata_interrupt,
409 .irq_clear = ata_bmdma_irq_clear, 403 .irq_clear = ata_bmdma_irq_clear,
410 .irq_on = ata_irq_on, 404 .irq_on = ata_irq_on,
411 .irq_ack = ata_irq_ack,
412 405
413 .port_start = ata_port_start, 406 .port_start = ata_sff_port_start,
414}; 407};
415 408
416/* 409/*
417 * Port operations for DMA capable ALi with cable detect and LBA48 410 * Port operations for DMA capable ALi with cable detect and LBA48
418 */ 411 */
419static struct ata_port_operations ali_c5_port_ops = { 412static struct ata_port_operations ali_c5_port_ops = {
420 .port_disable = ata_port_disable,
421 .set_piomode = ali_set_piomode, 413 .set_piomode = ali_set_piomode,
422 .set_dmamode = ali_set_dmamode, 414 .set_dmamode = ali_set_dmamode,
423 .mode_filter = ata_pci_default_filter, 415 .mode_filter = ata_pci_default_filter,
@@ -446,9 +438,8 @@ static struct ata_port_operations ali_c5_port_ops = {
446 .irq_handler = ata_interrupt, 438 .irq_handler = ata_interrupt,
447 .irq_clear = ata_bmdma_irq_clear, 439 .irq_clear = ata_bmdma_irq_clear,
448 .irq_on = ata_irq_on, 440 .irq_on = ata_irq_on,
449 .irq_ack = ata_irq_ack,
450 441
451 .port_start = ata_port_start, 442 .port_start = ata_sff_port_start,
452}; 443};
453 444
454 445