aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:55 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:55 -0400
commit0ae2e178652753ae1797d407755a3505f7c1d2a7 (patch)
treefa725edcfb4b9752ebf2aa49a3e42e158537d4ed /drivers/ide/arm
parentb8b739d3361c16773a30fe5c0360336bbc19f435 (diff)
ide: remove ->ide_dma_check (take 2)
* Add IDE_HFLAG_TRUST_BIOS_FOR_DMA host flag for host drivers that depend on BIOS for programming device/controller for DMA. Set it in cy82c693, generic, ns87415, opti621 and trm290 host drivers. * Add IDE_HFLAG_VDMA host flag for host drivers using VDMA. Set it in cs5520 host driver. * Teach ide_tune_dma() about IDE_HFLAG_TRUST_BIOS_FOR_DMA flag. * Add generic ide_dma_check() helper and remove all open coded ->ide_dma_check implementations. Fix all places checking for presence of ->ide_dma_check hook to check for ->ide_dma_on instead. * Remove no longer needed code from config_drive_for_dma(). * Make ide_tune_dma() static. v2: * Fix config_drive_for_dma() return values. * Fix ide-dma.c build for CONFIG_BLK_DEV_IDEDMA_PCI=n by adding dummy config_drive_for_dma() inline. * Fix IDE_HFLAG_TRUST_BIOS_FOR_DMA handling in ide_dma_check(). * Fix init_hwif_it8213() comment. There should be no functionality changes caused by this patch. Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r--drivers/ide/arm/icside.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index bd1f5b670378..0c6ce2faf8f5 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -309,14 +309,6 @@ static int icside_dma_on(ide_drive_t *drive)
309 return 0; 309 return 0;
310} 310}
311 311
312static int icside_dma_check(ide_drive_t *drive)
313{
314 if (ide_tune_dma(drive))
315 return 0;
316
317 return -1;
318}
319
320static int icside_dma_end(ide_drive_t *drive) 312static int icside_dma_end(ide_drive_t *drive)
321{ 313{
322 ide_hwif_t *hwif = HWIF(drive); 314 ide_hwif_t *hwif = HWIF(drive);
@@ -434,7 +426,6 @@ static void icside_dma_init(ide_hwif_t *hwif)
434 hwif->set_dma_mode = icside_set_dma_mode; 426 hwif->set_dma_mode = icside_set_dma_mode;
435 hwif->autodma = 1; 427 hwif->autodma = 1;
436 428
437 hwif->ide_dma_check = icside_dma_check;
438 hwif->dma_host_off = icside_dma_host_off; 429 hwif->dma_host_off = icside_dma_host_off;
439 hwif->dma_off_quietly = icside_dma_off_quietly; 430 hwif->dma_off_quietly = icside_dma_off_quietly;
440 hwif->dma_host_on = icside_dma_host_on; 431 hwif->dma_host_on = icside_dma_host_on;