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/piix.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/piix.c')
-rw-r--r-- | drivers/ide/pci/piix.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index c50ae3ab2e64..a8dd0c0add35 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -384,8 +384,6 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif) | |||
384 | return; | 384 | return; |
385 | } | 385 | } |
386 | 386 | ||
387 | hwif->autodma = 0; | ||
388 | |||
389 | hwif->set_pio_mode = &piix_set_pio_mode; | 387 | hwif->set_pio_mode = &piix_set_pio_mode; |
390 | hwif->set_dma_mode = &piix_set_dma_mode; | 388 | hwif->set_dma_mode = &piix_set_dma_mode; |
391 | 389 | ||
@@ -412,12 +410,6 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif) | |||
412 | 410 | ||
413 | if (no_piix_dma) | 411 | if (no_piix_dma) |
414 | hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0; | 412 | hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0; |
415 | |||
416 | if (!noautodma) | ||
417 | hwif->autodma = 1; | ||
418 | |||
419 | hwif->drives[1].autodma = hwif->autodma; | ||
420 | hwif->drives[0].autodma = hwif->autodma; | ||
421 | } | 413 | } |
422 | 414 | ||
423 | #define DECLARE_PIIX_DEV(name_str, udma) \ | 415 | #define DECLARE_PIIX_DEV(name_str, udma) \ |