diff options
Diffstat (limited to 'drivers/ide/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 38765d9b0314..5b1a0e950dfd 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -808,19 +808,6 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) | |||
808 | 808 | ||
809 | ide_set_hwifdata(hwif, ports); | 809 | ide_set_hwifdata(hwif, ports); |
810 | 810 | ||
811 | hwif->exec_command = scc_exec_command; | ||
812 | hwif->read_status = scc_read_status; | ||
813 | hwif->read_altstatus = scc_read_altstatus; | ||
814 | hwif->read_sff_dma_status = scc_read_sff_dma_status; | ||
815 | |||
816 | hwif->set_irq = scc_set_irq; | ||
817 | |||
818 | hwif->tf_load = scc_tf_load; | ||
819 | hwif->tf_read = scc_tf_read; | ||
820 | |||
821 | hwif->input_data = scc_input_data; | ||
822 | hwif->output_data = scc_output_data; | ||
823 | |||
824 | hwif->dma_base = dma_base; | 811 | hwif->dma_base = dma_base; |
825 | hwif->config_data = ports->ctl; | 812 | hwif->config_data = ports->ctl; |
826 | } | 813 | } |
@@ -872,6 +859,21 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
872 | hwif->ultra_mask = ATA_UDMA5; /* 100MHz */ | 859 | hwif->ultra_mask = ATA_UDMA5; /* 100MHz */ |
873 | } | 860 | } |
874 | 861 | ||
862 | static const struct ide_tp_ops scc_tp_ops = { | ||
863 | .exec_command = scc_exec_command, | ||
864 | .read_status = scc_read_status, | ||
865 | .read_altstatus = scc_read_altstatus, | ||
866 | .read_sff_dma_status = scc_read_sff_dma_status, | ||
867 | |||
868 | .set_irq = scc_set_irq, | ||
869 | |||
870 | .tf_load = scc_tf_load, | ||
871 | .tf_read = scc_tf_read, | ||
872 | |||
873 | .input_data = scc_input_data, | ||
874 | .output_data = scc_output_data, | ||
875 | }; | ||
876 | |||
875 | static const struct ide_port_ops scc_port_ops = { | 877 | static const struct ide_port_ops scc_port_ops = { |
876 | .set_pio_mode = scc_set_pio_mode, | 878 | .set_pio_mode = scc_set_pio_mode, |
877 | .set_dma_mode = scc_set_dma_mode, | 879 | .set_dma_mode = scc_set_dma_mode, |
@@ -895,6 +897,7 @@ static const struct ide_dma_ops scc_dma_ops = { | |||
895 | .name = name_str, \ | 897 | .name = name_str, \ |
896 | .init_iops = init_iops_scc, \ | 898 | .init_iops = init_iops_scc, \ |
897 | .init_hwif = init_hwif_scc, \ | 899 | .init_hwif = init_hwif_scc, \ |
900 | .tp_ops = &scc_tp_ops, \ | ||
898 | .port_ops = &scc_port_ops, \ | 901 | .port_ops = &scc_port_ops, \ |
899 | .dma_ops = &scc_dma_ops, \ | 902 | .dma_ops = &scc_dma_ops, \ |
900 | .host_flags = IDE_HFLAG_SINGLE, \ | 903 | .host_flags = IDE_HFLAG_SINGLE, \ |