diff options
Diffstat (limited to 'drivers/ata/pata_it821x.c')
-rw-r--r-- | drivers/ata/pata_it821x.c | 57 |
1 files changed, 8 insertions, 49 deletions
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 7d969c911731..669d224d30ca 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -636,71 +636,30 @@ static struct scsi_host_template it821x_sht = { | |||
636 | }; | 636 | }; |
637 | 637 | ||
638 | static struct ata_port_operations it821x_smart_port_ops = { | 638 | static struct ata_port_operations it821x_smart_port_ops = { |
639 | .set_mode = it821x_smart_set_mode, | 639 | .inherits = &ata_bmdma_port_ops, |
640 | .tf_load = ata_tf_load, | ||
641 | .tf_read = ata_tf_read, | ||
642 | .mode_filter = ata_pci_default_filter, | ||
643 | 640 | ||
644 | .check_status = ata_check_status, | ||
645 | .check_atapi_dma= it821x_check_atapi_dma, | 641 | .check_atapi_dma= it821x_check_atapi_dma, |
646 | .exec_command = ata_exec_command, | ||
647 | .dev_select = ata_std_dev_select, | ||
648 | .dev_config = it821x_dev_config, | ||
649 | |||
650 | .freeze = ata_bmdma_freeze, | ||
651 | .thaw = ata_bmdma_thaw, | ||
652 | .error_handler = ata_bmdma_error_handler, | ||
653 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
654 | .cable_detect = it821x_ident_hack, | ||
655 | |||
656 | .bmdma_setup = ata_bmdma_setup, | ||
657 | .bmdma_start = ata_bmdma_start, | ||
658 | .bmdma_stop = ata_bmdma_stop, | ||
659 | .bmdma_status = ata_bmdma_status, | ||
660 | |||
661 | .qc_prep = ata_qc_prep, | ||
662 | .qc_issue = it821x_smart_qc_issue_prot, | 642 | .qc_issue = it821x_smart_qc_issue_prot, |
663 | 643 | ||
664 | .data_xfer = ata_data_xfer, | 644 | .cable_detect = it821x_ident_hack, |
665 | 645 | .set_mode = it821x_smart_set_mode, | |
666 | .irq_handler = ata_interrupt, | 646 | .dev_config = it821x_dev_config, |
667 | .irq_clear = ata_bmdma_irq_clear, | ||
668 | .irq_on = ata_irq_on, | ||
669 | 647 | ||
670 | .port_start = it821x_port_start, | 648 | .port_start = it821x_port_start, |
671 | }; | 649 | }; |
672 | 650 | ||
673 | static struct ata_port_operations it821x_passthru_port_ops = { | 651 | static struct ata_port_operations it821x_passthru_port_ops = { |
674 | .set_piomode = it821x_passthru_set_piomode, | 652 | .inherits = &ata_bmdma_port_ops, |
675 | .set_dmamode = it821x_passthru_set_dmamode, | ||
676 | .mode_filter = ata_pci_default_filter, | ||
677 | 653 | ||
678 | .tf_load = ata_tf_load, | ||
679 | .tf_read = ata_tf_read, | ||
680 | .check_status = ata_check_status, | ||
681 | .exec_command = ata_exec_command, | ||
682 | .check_atapi_dma= it821x_check_atapi_dma, | 654 | .check_atapi_dma= it821x_check_atapi_dma, |
683 | .dev_select = it821x_passthru_dev_select, | 655 | .dev_select = it821x_passthru_dev_select, |
684 | |||
685 | .freeze = ata_bmdma_freeze, | ||
686 | .thaw = ata_bmdma_thaw, | ||
687 | .error_handler = ata_bmdma_error_handler, | ||
688 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
689 | .cable_detect = ata_cable_unknown, | ||
690 | |||
691 | .bmdma_setup = ata_bmdma_setup, | ||
692 | .bmdma_start = it821x_passthru_bmdma_start, | 656 | .bmdma_start = it821x_passthru_bmdma_start, |
693 | .bmdma_stop = it821x_passthru_bmdma_stop, | 657 | .bmdma_stop = it821x_passthru_bmdma_stop, |
694 | .bmdma_status = ata_bmdma_status, | ||
695 | |||
696 | .qc_prep = ata_qc_prep, | ||
697 | .qc_issue = it821x_passthru_qc_issue_prot, | 658 | .qc_issue = it821x_passthru_qc_issue_prot, |
698 | 659 | ||
699 | .data_xfer = ata_data_xfer, | 660 | .cable_detect = ata_cable_unknown, |
700 | 661 | .set_piomode = it821x_passthru_set_piomode, | |
701 | .irq_clear = ata_bmdma_irq_clear, | 662 | .set_dmamode = it821x_passthru_set_dmamode, |
702 | .irq_handler = ata_interrupt, | ||
703 | .irq_on = ata_irq_on, | ||
704 | 663 | ||
705 | .port_start = it821x_port_start, | 664 | .port_start = it821x_port_start, |
706 | }; | 665 | }; |