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/mips | |
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/mips')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index cd00081fb278..47c035a550e3 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -700,19 +700,14 @@ static int au_ide_probe(struct device *dev) | |||
700 | hwif->dma_lost_irq = &auide_dma_lost_irq; | 700 | hwif->dma_lost_irq = &auide_dma_lost_irq; |
701 | hwif->ide_dma_on = &auide_dma_on; | 701 | hwif->ide_dma_on = &auide_dma_on; |
702 | 702 | ||
703 | hwif->autodma = 1; | ||
704 | hwif->drives[0].autodma = hwif->autodma; | ||
705 | hwif->drives[1].autodma = hwif->autodma; | ||
706 | hwif->atapi_dma = 1; | 703 | hwif->atapi_dma = 1; |
707 | 704 | ||
708 | #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ | 705 | #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ |
709 | hwif->autodma = 0; | ||
710 | hwif->channel = 0; | 706 | hwif->channel = 0; |
711 | hwif->hold = 1; | 707 | hwif->hold = 1; |
712 | hwif->select_data = 0; /* no chipset-specific code */ | 708 | hwif->select_data = 0; /* no chipset-specific code */ |
713 | hwif->config_data = 0; /* no chipset-specific code */ | 709 | hwif->config_data = 0; /* no chipset-specific code */ |
714 | 710 | ||
715 | hwif->drives[0].autodma = 0; | ||
716 | hwif->drives[0].autotune = 1; /* 1=autotune, 2=noautotune, 0=default */ | 711 | hwif->drives[0].autotune = 1; /* 1=autotune, 2=noautotune, 0=default */ |
717 | #endif | 712 | #endif |
718 | hwif->drives[0].no_io_32bit = 1; | 713 | hwif->drives[0].no_io_32bit = 1; |