aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/pdc202xx_new.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/pdc202xx_new.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/pdc202xx_new.c')
-rw-r--r--drivers/ide/pci/pdc202xx_new.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 9767232e2f8a..65e460dbe8b6 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -223,16 +223,6 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
223 return ATA_CBL_PATA80; 223 return ATA_CBL_PATA80;
224} 224}
225 225
226static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
227{
228 if (ide_tune_dma(drive))
229 return 0;
230
231 ide_set_max_pio(drive);
232
233 return -1;
234}
235
236static int pdcnew_quirkproc(ide_drive_t *drive) 226static int pdcnew_quirkproc(ide_drive_t *drive)
237{ 227{
238 const char **list, *model = drive->id->model; 228 const char **list, *model = drive->id->model;
@@ -499,8 +489,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
499 hwif->ultra_mask = hwif->cds->udma_mask; 489 hwif->ultra_mask = hwif->cds->udma_mask;
500 hwif->mwdma_mask = 0x07; 490 hwif->mwdma_mask = 0x07;
501 491
502 hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate;
503
504 if (hwif->cbl != ATA_CBL_PATA40_SHORT) 492 if (hwif->cbl != ATA_CBL_PATA40_SHORT)
505 hwif->cbl = pdcnew_cable_detect(hwif); 493 hwif->cbl = pdcnew_cable_detect(hwif);
506 494