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>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index e4a4f1fb5be7..bb893ffcc987 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -114,8 +114,8 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
 
-        if (!hwif->dma_base)
-                goto fallback;
+        if (hwif->dma_base == 0)
+                return;
 
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x7f;
@@ -123,14 +123,6 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = ata66_jmicron(hwif);
-
-        hwif->autodma = 1;
-        hwif->drives[0].autodma = hwif->autodma;
-        hwif->drives[1].autodma = hwif->autodma;
-        return;
-fallback:
-        hwif->autodma = 0;
-        return;
 }
 
 static ide_pci_device_t jmicron_chipset __devinitdata = {