diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:58 -0400 |
commit | 9ff6f72f432364991d68e99cae72cb141c166e70 (patch) | |
tree | e37e5dc6d1b2387f7cbc2909d5cb534d4a395a79 /drivers/ide/pci/pdc202xx_new.c | |
parent | 1b5169405e50b98b2bd1e4f86c7706ea24a59193 (diff) |
ide: remove hwif->autodma and drive->autodma
* hpt34x.c: disable DMA masks for HPT345
(hwif->autodma is zero so DMA won't be enabled anyway).
* trm290.c: disable IDE_HFLAG_TRUST_BIOS_FOR_DMA flag
(hwif->autodma is zero so DMA won't be enabled anyway).
* Check noautodma global variable instead of drive->autodma in ide_tune_dma().
This fixes handling of "ide=nodma" kernel parameter for icside, ide-cris,
au1xxx-ide, pmac, it821x, jmicron, sgiioc4 and siimage host drivers.
* Remove hwif->autodma (it was not checked by IDE core code anyway) and
drive->autodma (was set by all host drivers - except HPT345/TRM290 special
cases - unless "ide=nodma" was used).
While at it:
- remove needless printk() from icside.c
- remove stale FIXME/comment from ide-probe.c
- don't force DMA off if PCI bus-mastering had to be enabled in setup-pci.c
(this setting was always later over-ridden by host drivers anyway)
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.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index d1087cc83f12..8704b6f33312 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -469,8 +469,6 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha | |||
469 | 469 | ||
470 | static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif) | 470 | static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif) |
471 | { | 471 | { |
472 | hwif->autodma = 0; | ||
473 | |||
474 | hwif->set_pio_mode = &pdcnew_set_pio_mode; | 472 | hwif->set_pio_mode = &pdcnew_set_pio_mode; |
475 | hwif->set_dma_mode = &pdcnew_set_mode; | 473 | hwif->set_dma_mode = &pdcnew_set_mode; |
476 | 474 | ||
@@ -491,10 +489,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif) | |||
491 | 489 | ||
492 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 490 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
493 | hwif->cbl = pdcnew_cable_detect(hwif); | 491 | hwif->cbl = pdcnew_cable_detect(hwif); |
494 | |||
495 | if (!noautodma) | ||
496 | hwif->autodma = 1; | ||
497 | hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma; | ||
498 | } | 492 | } |
499 | 493 | ||
500 | static int __devinit init_setup_pdcnew(struct pci_dev *dev, ide_pci_device_t *d) | 494 | static int __devinit init_setup_pdcnew(struct pci_dev *dev, ide_pci_device_t *d) |