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/serverworks.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/serverworks.c')
-rw-r--r-- | drivers/ide/pci/serverworks.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index e4208e3d9901..d3ffc52e22af 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -374,8 +374,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | |||
374 | 374 | ||
375 | hwif->mwdma_mask = 0x07; | 375 | hwif->mwdma_mask = 0x07; |
376 | 376 | ||
377 | hwif->autodma = 0; | ||
378 | |||
379 | hwif->drives[0].autotune = 1; | 377 | hwif->drives[0].autotune = 1; |
380 | hwif->drives[1].autotune = 1; | 378 | hwif->drives[1].autotune = 1; |
381 | 379 | ||
@@ -386,10 +384,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | |||
386 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 384 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
387 | hwif->cbl = ata66_svwks(hwif); | 385 | hwif->cbl = ata66_svwks(hwif); |
388 | } | 386 | } |
389 | if (!noautodma) | ||
390 | hwif->autodma = 1; | ||
391 | |||
392 | hwif->drives[0].autodma = hwif->drives[1].autodma = 1; | ||
393 | } | 387 | } |
394 | 388 | ||
395 | static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d) | 389 | static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d) |