diff options
Diffstat (limited to 'drivers/ata/pata_triflex.c')
-rw-r--r-- | drivers/ata/pata_triflex.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index f07b0e5df222..bd546a389ce1 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c | |||
@@ -71,11 +71,6 @@ static int triflex_prereset(struct ata_link *link, unsigned long deadline) | |||
71 | 71 | ||
72 | 72 | ||
73 | 73 | ||
74 | static void triflex_error_handler(struct ata_port *ap) | ||
75 | { | ||
76 | ata_bmdma_drive_eh(ap, triflex_prereset, ata_std_softreset, NULL, ata_std_postreset); | ||
77 | } | ||
78 | |||
79 | /** | 74 | /** |
80 | * triflex_load_timing - timing configuration | 75 | * triflex_load_timing - timing configuration |
81 | * @ap: ATA interface | 76 | * @ap: ATA interface |
@@ -189,7 +184,7 @@ static struct ata_port_operations triflex_port_ops = { | |||
189 | .bmdma_stop = triflex_bmdma_stop, | 184 | .bmdma_stop = triflex_bmdma_stop, |
190 | .cable_detect = ata_cable_40wire, | 185 | .cable_detect = ata_cable_40wire, |
191 | .set_piomode = triflex_set_piomode, | 186 | .set_piomode = triflex_set_piomode, |
192 | .error_handler = triflex_error_handler, | 187 | .prereset = triflex_prereset, |
193 | }; | 188 | }; |
194 | 189 | ||
195 | static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 190 | static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id) |