aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/piix.c
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/pci/piix.c
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/pci/piix.c')
-rw-r--r--drivers/ide/pci/piix.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index dcb0701f10b5..d5a31e9f5727 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -255,24 +255,6 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
255} 255}
256 256
257/** 257/**
258 * piix_config_drive_xfer_rate - set up an IDE device
259 * @drive: IDE drive to configure
260 *
261 * Set up the PIIX interface for the best available speed on this
262 * interface, preferring DMA to PIO.
263 */
264
265static int piix_config_drive_xfer_rate (ide_drive_t *drive)
266{
267 if (ide_tune_dma(drive))
268 return 0;
269
270 ide_set_max_pio(drive);
271
272 return -1;
273}
274
275/**
276 * piix_is_ichx - check if ICHx 258 * piix_is_ichx - check if ICHx
277 * @dev: PCI device to check 259 * @dev: PCI device to check
278 * 260 *
@@ -432,7 +414,6 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
432 if (no_piix_dma) 414 if (no_piix_dma)
433 hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0; 415 hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0;
434 416
435 hwif->ide_dma_check = &piix_config_drive_xfer_rate;
436 if (!noautodma) 417 if (!noautodma)
437 hwif->autodma = 1; 418 hwif->autodma = 1;
438 419