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/sc1200.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/sc1200.c')
-rw-r--r-- | drivers/ide/pci/sc1200.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 29945b99161e..54c5c98a2e26 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -364,7 +364,6 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif) | |||
364 | { | 364 | { |
365 | if (hwif->mate) | 365 | if (hwif->mate) |
366 | hwif->serialized = hwif->mate->serialized = 1; | 366 | hwif->serialized = hwif->mate->serialized = 1; |
367 | hwif->autodma = 0; | ||
368 | 367 | ||
369 | hwif->set_pio_mode = &sc1200_set_pio_mode; | 368 | hwif->set_pio_mode = &sc1200_set_pio_mode; |
370 | hwif->set_dma_mode = &sc1200_set_dma_mode; | 369 | hwif->set_dma_mode = &sc1200_set_dma_mode; |
@@ -378,15 +377,9 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif) | |||
378 | hwif->udma_filter = sc1200_udma_filter; | 377 | hwif->udma_filter = sc1200_udma_filter; |
379 | hwif->ide_dma_end = &sc1200_ide_dma_end; | 378 | hwif->ide_dma_end = &sc1200_ide_dma_end; |
380 | 379 | ||
381 | if (!noautodma) | ||
382 | hwif->autodma = 1; | ||
383 | |||
384 | hwif->atapi_dma = 1; | 380 | hwif->atapi_dma = 1; |
385 | hwif->ultra_mask = 0x07; | 381 | hwif->ultra_mask = 0x07; |
386 | hwif->mwdma_mask = 0x07; | 382 | hwif->mwdma_mask = 0x07; |
387 | |||
388 | hwif->drives[0].autodma = hwif->autodma; | ||
389 | hwif->drives[1].autodma = hwif->autodma; | ||
390 | } | 383 | } |
391 | 384 | ||
392 | static ide_pci_device_t sc1200_chipset __devinitdata = { | 385 | static ide_pci_device_t sc1200_chipset __devinitdata = { |