]> err.no Git - linux-2.6/commitdiff
pdc202xx_new: use ide_tune_dma()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 15 May 2007 22:51:43 +0000 (00:51 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 15 May 2007 22:51:43 +0000 (00:51 +0200)
* remove code enabling IORDY and prefetch from config_chipset_for_dma(),
  as the comment states it has no real effect because these settings are
  overriden when the PIO mode is set (and for this driver ->autotune == 1
  so PIO mode is always programmed)

* use ide_tune_dma() in pdcnew_config_drive_xfer_rate() and remove no longer
  needed config_chipset_for_dma()

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/pci/pdc202xx_new.c

index 65b1e124edf773731cd21250b03a3780d8674bfb..cc0bfdcf1f196d1b05a7a4c01fc00579a356a320 100644 (file)
@@ -228,38 +228,11 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
        return get_indexed_reg(hwif, 0x0b) & 0x04;
 }
 
-static int config_chipset_for_dma(ide_drive_t *drive)
-{
-       struct hd_driveid *id   = drive->id;
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 speed;
-
-       if (id->capability & 4) {
-               /*
-                * Set IORDY_EN & PREFETCH_EN (this seems to have
-                * NO real effect since this register is reloaded
-                * by hardware when the transfer mode is selected)
-                */
-               u8 tmp, adj = (drive->dn & 1) ? 0x08 : 0x00;
-
-               tmp = get_indexed_reg(hwif, 0x13 + adj);
-               set_indexed_reg(hwif, 0x13 + adj, tmp | 0x03);
-       }
-
-       speed = ide_max_dma_mode(drive);
-
-       if (!speed)
-               return 0;
-
-       (void) hwif->speedproc(drive, speed);
-       return ide_dma_enable(drive);
-}
-
 static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
 {
        drive->init_speed = 0;
 
-       if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+       if (ide_tune_dma(drive))
                return 0;
 
        if (ide_use_fast_pio(drive))