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/sis5513.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/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 729ee86e75cc..d758865f06be 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -811,8 +811,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) | |||
811 | { | 811 | { |
812 | u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f }; | 812 | u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f }; |
813 | 813 | ||
814 | hwif->autodma = 0; | ||
815 | |||
816 | if (!hwif->irq) | 814 | if (!hwif->irq) |
817 | hwif->irq = hwif->channel ? 15 : 14; | 815 | hwif->irq = hwif->channel ? 15 : 14; |
818 | 816 | ||
@@ -835,12 +833,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) | |||
835 | 833 | ||
836 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 834 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
837 | hwif->cbl = ata66_sis5513(hwif); | 835 | hwif->cbl = ata66_sis5513(hwif); |
838 | |||
839 | if (!noautodma) | ||
840 | hwif->autodma = 1; | ||
841 | |||
842 | hwif->drives[0].autodma = hwif->autodma; | ||
843 | hwif->drives[1].autodma = hwif->autodma; | ||
844 | } | 836 | } |
845 | 837 | ||
846 | static ide_pci_device_t sis5513_chipset __devinitdata = { | 838 | static ide_pci_device_t sis5513_chipset __devinitdata = { |