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/alim15x3.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/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 0ef7703b036f..31d4e50647d5 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -660,7 +660,6 @@ static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif) | |||
660 | 660 | ||
661 | static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif) | 661 | static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif) |
662 | { | 662 | { |
663 | hwif->autodma = 0; | ||
664 | hwif->set_pio_mode = &ali_set_pio_mode; | 663 | hwif->set_pio_mode = &ali_set_pio_mode; |
665 | hwif->set_dma_mode = &ali_set_dma_mode; | 664 | hwif->set_dma_mode = &ali_set_dma_mode; |
666 | hwif->udma_filter = &ali_udma_filter; | 665 | hwif->udma_filter = &ali_udma_filter; |
@@ -699,12 +698,6 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif) | |||
699 | 698 | ||
700 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 699 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
701 | hwif->cbl = ata66_ali15x3(hwif); | 700 | hwif->cbl = ata66_ali15x3(hwif); |
702 | |||
703 | if (!noautodma) | ||
704 | hwif->autodma = 1; | ||
705 | |||
706 | hwif->drives[0].autodma = hwif->autodma; | ||
707 | hwif->drives[1].autodma = hwif->autodma; | ||
708 | } | 701 | } |
709 | 702 | ||
710 | /** | 703 | /** |