aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
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 /include/linux/ide.h
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 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index c144c7f2605a..79652c5c0ea5 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -576,7 +576,6 @@ typedef struct ide_drive_s {
576 select_t select; /* basic drive/head select reg value */ 576 select_t select; /* basic drive/head select reg value */
577 577
578 u8 keep_settings; /* restore settings after drive reset */ 578 u8 keep_settings; /* restore settings after drive reset */
579 u8 autodma; /* device can safely use dma on host */
580 u8 using_dma; /* disk is using dma for read/write */ 579 u8 using_dma; /* disk is using dma for read/write */
581 u8 retry_pio; /* retrying dma capable host in pio */ 580 u8 retry_pio; /* retrying dma capable host in pio */
582 u8 state; /* retry state */ 581 u8 state; /* retry state */
@@ -797,7 +796,6 @@ typedef struct hwif_s {
797 unsigned serialized : 1; /* serialized all channel operation */ 796 unsigned serialized : 1; /* serialized all channel operation */
798 unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */ 797 unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */
799 unsigned reset : 1; /* reset after probe */ 798 unsigned reset : 1; /* reset after probe */
800 unsigned autodma : 1; /* auto-attempt using DMA at boot */
801 unsigned no_lba48 : 1; /* 1 = cannot do LBA48 */ 799 unsigned no_lba48 : 1; /* 1 = cannot do LBA48 */
802 unsigned no_lba48_dma : 1; /* 1 = cannot do LBA48 DMA */ 800 unsigned no_lba48_dma : 1; /* 1 = cannot do LBA48 DMA */
803 unsigned auto_poll : 1; /* supports nop auto-poll */ 801 unsigned auto_poll : 1; /* supports nop auto-poll */