diff options
Diffstat (limited to 'drivers/ata/pata_scc.c')
-rw-r--r-- | drivers/ata/pata_scc.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 033d1f3a82de..07f2d7a6f1a8 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
@@ -905,17 +905,6 @@ static void scc_std_postreset(struct ata_link *link, unsigned int *classes) | |||
905 | } | 905 | } |
906 | 906 | ||
907 | /** | 907 | /** |
908 | * scc_error_handler - Stock error handler for BMDMA controller | ||
909 | * @ap: port to handle error for | ||
910 | */ | ||
911 | |||
912 | static void scc_error_handler (struct ata_port *ap) | ||
913 | { | ||
914 | ata_bmdma_drive_eh(ap, scc_pata_prereset, scc_std_softreset, NULL, | ||
915 | scc_std_postreset); | ||
916 | } | ||
917 | |||
918 | /** | ||
919 | * scc_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. | 908 | * scc_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. |
920 | * @ap: Port associated with this ATA transaction. | 909 | * @ap: Port associated with this ATA transaction. |
921 | * | 910 | * |
@@ -992,7 +981,9 @@ static const struct ata_port_operations scc_pata_ops = { | |||
992 | .data_xfer = scc_data_xfer, | 981 | .data_xfer = scc_data_xfer, |
993 | 982 | ||
994 | .freeze = scc_bmdma_freeze, | 983 | .freeze = scc_bmdma_freeze, |
995 | .error_handler = scc_error_handler, | 984 | .prereset = scc_pata_prereset, |
985 | .softreset = scc_std_softreset, | ||
986 | .postreset = scc_std_postreset, | ||
996 | .post_internal_cmd = scc_bmdma_stop, | 987 | .post_internal_cmd = scc_bmdma_stop, |
997 | 988 | ||
998 | .irq_clear = scc_bmdma_irq_clear, | 989 | .irq_clear = scc_bmdma_irq_clear, |