diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
commit | e6830a86c260d73c6f370aa7ed17ee6c71e5ee05 (patch) | |
tree | c2c7d472184da1549852b86eef551609cddcbcbf /include | |
parent | b109f526cabcd098131e770fd6232282bce147b4 (diff) |
ide: call ide_build_sglist() prior to ->dma_setup (v2)
* Re-map sg table if needed in ide_build_sglist().
* Move ide_build_sglist() call from ->dma_setup to its users.
* Un-export ide_build_sglist().
v2:
* Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap).
There should be no functional changes caused by this patch.
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 9127d87cfa93..2ee236d1f3ac 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1477,6 +1477,8 @@ static inline int ide_set_dma(ide_drive_t *drive) { return 1; } | |||
1477 | static inline void ide_check_dma_crc(ide_drive_t *drive) { ; } | 1477 | static inline void ide_check_dma_crc(ide_drive_t *drive) { ; } |
1478 | static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; } | 1478 | static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; } |
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, | ||
1481 | struct request *rq) { return 0; } | ||
1480 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | 1482 | #endif /* CONFIG_BLK_DEV_IDEDMA */ |
1481 | 1483 | ||
1482 | #ifdef CONFIG_BLK_DEV_IDEACPI | 1484 | #ifdef CONFIG_BLK_DEV_IDEACPI |