diff options
Diffstat (limited to 'drivers/ata/pata_bf54x.c')
-rw-r--r-- | drivers/ata/pata_bf54x.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index 7a22ef483061..eea275acb2a8 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -1314,17 +1314,6 @@ static void bfin_std_postreset(struct ata_link *link, unsigned int *classes) | |||
1314 | write_atapi_register(base, ATA_REG_CTRL, ap->ctl); | 1314 | write_atapi_register(base, ATA_REG_CTRL, ap->ctl); |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | /** | ||
1318 | * bfin_error_handler - Stock error handler for DMA controller | ||
1319 | * @ap: port to handle error for | ||
1320 | */ | ||
1321 | |||
1322 | static void bfin_error_handler(struct ata_port *ap) | ||
1323 | { | ||
1324 | ata_bmdma_drive_eh(ap, ata_std_prereset, bfin_std_softreset, NULL, | ||
1325 | bfin_std_postreset); | ||
1326 | } | ||
1327 | |||
1328 | static void bfin_port_stop(struct ata_port *ap) | 1317 | static void bfin_port_stop(struct ata_port *ap) |
1329 | { | 1318 | { |
1330 | dev_dbg(ap->dev, "in atapi port stop\n"); | 1319 | dev_dbg(ap->dev, "in atapi port stop\n"); |
@@ -1385,7 +1374,8 @@ static const struct ata_port_operations bfin_pata_ops = { | |||
1385 | 1374 | ||
1386 | .freeze = bfin_bmdma_freeze, | 1375 | .freeze = bfin_bmdma_freeze, |
1387 | .thaw = bfin_bmdma_thaw, | 1376 | .thaw = bfin_bmdma_thaw, |
1388 | .error_handler = bfin_error_handler, | 1377 | .softreset = bfin_std_softreset, |
1378 | .postreset = bfin_std_postreset, | ||
1389 | .post_internal_cmd = bfin_bmdma_stop, | 1379 | .post_internal_cmd = bfin_bmdma_stop, |
1390 | 1380 | ||
1391 | .irq_clear = bfin_irq_clear, | 1381 | .irq_clear = bfin_irq_clear, |