aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/cs5530.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:58 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:58 -0400
commit9ff6f72f432364991d68e99cae72cb141c166e70 (patch)
treee37e5dc6d1b2387f7cbc2909d5cb534d4a395a79 /drivers/ide/pci/cs5530.c
parent1b5169405e50b98b2bd1e4f86c7706ea24a59193 (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/cs5530.c')
-rw-r--r--drivers/ide/pci/cs5530.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index ef51bbfd2cba..0d23b8aabe9c 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -244,7 +244,6 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
244{ 244{
245 unsigned long basereg; 245 unsigned long basereg;
246 u32 d0_timings; 246 u32 d0_timings;
247 hwif->autodma = 0;
248 247
249 if (hwif->mate) 248 if (hwif->mate)
250 hwif->serialized = hwif->mate->serialized = 1; 249 hwif->serialized = hwif->mate->serialized = 1;
@@ -270,11 +269,6 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
270 hwif->mwdma_mask = 0x07; 269 hwif->mwdma_mask = 0x07;
271 270
272 hwif->udma_filter = cs5530_udma_filter; 271 hwif->udma_filter = cs5530_udma_filter;
273
274 if (!noautodma)
275 hwif->autodma = 1;
276 hwif->drives[0].autodma = hwif->autodma;
277 hwif->drives[1].autodma = hwif->autodma;
278} 272}
279 273
280static ide_pci_device_t cs5530_chipset __devinitdata = { 274static ide_pci_device_t cs5530_chipset __devinitdata = {