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/amd74xx.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/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 669951d8a20d..c7b3a5650259 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -376,8 +376,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
376 | if (hwif->irq == 0) /* 0 is bogus but will do for now */ | 376 | if (hwif->irq == 0) /* 0 is bogus but will do for now */ |
377 | hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel); | 377 | hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel); |
378 | 378 | ||
379 | hwif->autodma = 0; | ||
380 | |||
381 | hwif->set_pio_mode = &amd_set_pio_mode; | 379 | hwif->set_pio_mode = &amd_set_pio_mode; |
382 | hwif->set_dma_mode = &amd_set_drive; | 380 | hwif->set_dma_mode = &amd_set_drive; |
383 | 381 | ||
@@ -404,11 +402,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
404 | else | 402 | else |
405 | hwif->cbl = ATA_CBL_PATA40; | 403 | hwif->cbl = ATA_CBL_PATA40; |
406 | } | 404 | } |
407 | |||
408 | if (!noautodma) | ||
409 | hwif->autodma = 1; | ||
410 | hwif->drives[0].autodma = hwif->autodma; | ||
411 | hwif->drives[1].autodma = hwif->autodma; | ||
412 | } | 405 | } |
413 | 406 | ||
414 | #define DECLARE_AMD_DEV(name_str) \ | 407 | #define DECLARE_AMD_DEV(name_str) \ |