diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:20 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:20 -0400 |
commit | 4453011f959a5f5c6c7a33aea54fe17f5e43a867 (patch) | |
tree | 7ac781ab8d82b21cdf932b1736026ebe9fea757a /drivers/ide/scc_pata.c | |
parent | 1cee52de28aa687760ad262ad0834d1bf6c6d2ac (diff) |
ide: destroy DMA mappings after ending DMA (v2)
Move ide_destroy_dmatable() call out from ->dma_end method to
{ide_pc,cdrom_newpc,ide_dma}_intr(), ide_dma_timeout_retry()
and sgiioc4_resetproc().
This causes minor/safe behavior changes w.r.t.:
* cmd64x.c::cmd64{8,x}_dma_end()
* cs5536.c::cs5536_dma_end()
* icside.c::icside_dma_end()
* it821x.c::it821x_dma_end()
* scc_pata.c::__scc_dma_end()
* sl82c105.c::sl82c105_dma_end()
* tx4939ide.c::tx4939ide_dma_end()
v2:
* Fix build for CONFIG_BLK_DEV_IDEDMA=n (reported by Randy Dunlap).
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/scc_pata.c')
-rw-r--r-- | drivers/ide/scc_pata.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 64534d150b0..693536ebe33 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -365,8 +365,6 @@ static int __scc_dma_end(ide_drive_t *drive) | |||
365 | dma_stat = scc_dma_sff_read_status(hwif); | 365 | dma_stat = scc_dma_sff_read_status(hwif); |
366 | /* clear the INTR & ERROR bits */ | 366 | /* clear the INTR & ERROR bits */ |
367 | scc_ide_outb(dma_stat | 6, hwif->dma_base + 4); | 367 | scc_ide_outb(dma_stat | 6, hwif->dma_base + 4); |
368 | /* purge DMA mappings */ | ||
369 | ide_destroy_dmatable(drive); | ||
370 | /* verify good DMA status */ | 368 | /* verify good DMA status */ |
371 | wmb(); | 369 | wmb(); |
372 | return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; | 370 | return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; |