diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:32 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:32 -0500 |
commit | 062f9f024dcdb927cfd35c9ee8a68f59cbb1136f (patch) | |
tree | ef592f702eea3e4333b1e0e2e3db7ce945408261 /drivers/ide/ide-dma.c | |
parent | 5c05ff68b9a9b40a9be949497e0aa980185565cf (diff) |
ide: use ide_build_sglist() and ide_destroy_dmatable() in non-PCI host drivers
* Make ide_build_sglist() and ide_destroy_dmatable() available also when
CONFIG_BLK_DEV_IDEDMA_PCI=n.
* Use ide_build_sglist() and ide_destroy_dmatable() in {ics,au1xxx-}ide.c
and remove no longer needed {ics,au}ide_build_sglist().
There should be no functionality changes caused by this patch.
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ec7c5c8dc698..64fd78ba2810 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -170,7 +170,6 @@ static int ide_dma_good_drive(ide_drive_t *drive) | |||
170 | return ide_in_drive_list(drive->id, drive_whitelist); | 170 | return ide_in_drive_list(drive->id, drive_whitelist); |
171 | } | 171 | } |
172 | 172 | ||
173 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI | ||
174 | /** | 173 | /** |
175 | * ide_build_sglist - map IDE scatter gather for DMA I/O | 174 | * ide_build_sglist - map IDE scatter gather for DMA I/O |
176 | * @drive: the drive to build the DMA table for | 175 | * @drive: the drive to build the DMA table for |
@@ -200,6 +199,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq) | |||
200 | 199 | ||
201 | EXPORT_SYMBOL_GPL(ide_build_sglist); | 200 | EXPORT_SYMBOL_GPL(ide_build_sglist); |
202 | 201 | ||
202 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI | ||
203 | /** | 203 | /** |
204 | * ide_build_dmatable - build IDE DMA table | 204 | * ide_build_dmatable - build IDE DMA table |
205 | * | 205 | * |
@@ -294,6 +294,7 @@ use_pio_instead: | |||
294 | } | 294 | } |
295 | 295 | ||
296 | EXPORT_SYMBOL_GPL(ide_build_dmatable); | 296 | EXPORT_SYMBOL_GPL(ide_build_dmatable); |
297 | #endif | ||
297 | 298 | ||
298 | /** | 299 | /** |
299 | * ide_destroy_dmatable - clean up DMA mapping | 300 | * ide_destroy_dmatable - clean up DMA mapping |
@@ -316,6 +317,7 @@ void ide_destroy_dmatable (ide_drive_t *drive) | |||
316 | 317 | ||
317 | EXPORT_SYMBOL_GPL(ide_destroy_dmatable); | 318 | EXPORT_SYMBOL_GPL(ide_destroy_dmatable); |
318 | 319 | ||
320 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI | ||
319 | /** | 321 | /** |
320 | * config_drive_for_dma - attempt to activate IDE DMA | 322 | * config_drive_for_dma - attempt to activate IDE DMA |
321 | * @drive: the drive to place in DMA mode | 323 | * @drive: the drive to place in DMA mode |