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/ns87415.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/ns87415.c')
-rw-r--r-- | drivers/ide/pci/ns87415.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 726f67cc85d0..a8cd50ab62fb 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -197,7 +197,6 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
197 | u8 stat; | 197 | u8 stat; |
198 | #endif | 198 | #endif |
199 | 199 | ||
200 | hwif->autodma = 0; | ||
201 | hwif->selectproc = &ns87415_selectproc; | 200 | hwif->selectproc = &ns87415_selectproc; |
202 | 201 | ||
203 | /* | 202 | /* |
@@ -259,11 +258,6 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
259 | outb(0x60, hwif->dma_status); | 258 | outb(0x60, hwif->dma_status); |
260 | hwif->dma_setup = &ns87415_ide_dma_setup; | 259 | hwif->dma_setup = &ns87415_ide_dma_setup; |
261 | hwif->ide_dma_end = &ns87415_ide_dma_end; | 260 | hwif->ide_dma_end = &ns87415_ide_dma_end; |
262 | |||
263 | if (!noautodma) | ||
264 | hwif->autodma = 1; | ||
265 | hwif->drives[0].autodma = hwif->autodma; | ||
266 | hwif->drives[1].autodma = hwif->autodma; | ||
267 | } | 261 | } |
268 | 262 | ||
269 | static ide_pci_device_t ns87415_chipset __devinitdata = { | 263 | static ide_pci_device_t ns87415_chipset __devinitdata = { |