aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ppc
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/ppc
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/ppc')
-rw-r--r--drivers/ide/ppc/pmac.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index e0859385732e..dac66b851085 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1579,21 +1579,6 @@ pmac_ide_destroy_dmatable (ide_drive_t *drive)
1579} 1579}
1580 1580
1581/* 1581/*
1582 * Check what is the best DMA timing setting for the drive and
1583 * call appropriate functions to apply it.
1584 */
1585static int
1586pmac_ide_dma_check(ide_drive_t *drive)
1587{
1588 if (ide_tune_dma(drive))
1589 return 0;
1590
1591 ide_set_max_pio(drive);
1592
1593 return -1;
1594}
1595
1596/*
1597 * Prepare a DMA transfer. We build the DMA table, adjust the timings for 1582 * Prepare a DMA transfer. We build the DMA table, adjust the timings for
1598 * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion 1583 * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion
1599 */ 1584 */
@@ -1790,7 +1775,6 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
1790 1775
1791 hwif->dma_off_quietly = &ide_dma_off_quietly; 1776 hwif->dma_off_quietly = &ide_dma_off_quietly;
1792 hwif->ide_dma_on = &__ide_dma_on; 1777 hwif->ide_dma_on = &__ide_dma_on;
1793 hwif->ide_dma_check = &pmac_ide_dma_check;
1794 hwif->dma_setup = &pmac_ide_dma_setup; 1778 hwif->dma_setup = &pmac_ide_dma_setup;
1795 hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd; 1779 hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd;
1796 hwif->dma_start = &pmac_ide_dma_start; 1780 hwif->dma_start = &pmac_ide_dma_start;