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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/ide.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index d3035f2f1250..b6c4942fde11 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1479,6 +1479,7 @@ static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int erro | |||
1479 | static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; } | 1479 | static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; } |
1480 | static inline int ide_build_sglist(ide_drive_t *drive, | 1480 | static inline int ide_build_sglist(ide_drive_t *drive, |
1481 | struct ide_cmd *cmd) { return 0; } | 1481 | struct ide_cmd *cmd) { return 0; } |
1482 | static inline void ide_destroy_dmatable(ide_drive_t *drive) { ; } | ||
1482 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | 1483 | #endif /* CONFIG_BLK_DEV_IDEDMA */ |
1483 | 1484 | ||
1484 | #ifdef CONFIG_BLK_DEV_IDEACPI | 1485 | #ifdef CONFIG_BLK_DEV_IDEACPI |