Commit a0f562df authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] ide: simplify CONFIG_IDEDMA_ONLYDISK logic a bit

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8cd6e401
...@@ -800,18 +800,12 @@ void probe_hwif (ide_hwif_t *hwif) ...@@ -800,18 +800,12 @@ void probe_hwif (ide_hwif_t *hwif)
for (unit = 0; unit < MAX_DRIVES; ++unit) { for (unit = 0; unit < MAX_DRIVES; ++unit) {
ide_drive_t *drive = &hwif->drives[unit]; ide_drive_t *drive = &hwif->drives[unit];
int enable_dma = 1;
if (drive->present) { if (drive->present) {
if (hwif->tuneproc != NULL && if (hwif->tuneproc != NULL &&
drive->autotune == IDE_TUNE_AUTO) drive->autotune == IDE_TUNE_AUTO)
/* auto-tune PIO mode */ /* auto-tune PIO mode */
hwif->tuneproc(drive, 255); hwif->tuneproc(drive, 255);
#ifdef CONFIG_IDEDMA_ONLYDISK
if (drive->media != ide_disk)
enable_dma = 0;
#endif
/* /*
* MAJOR HACK BARF :-/ * MAJOR HACK BARF :-/
* *
...@@ -831,7 +825,9 @@ void probe_hwif (ide_hwif_t *hwif) ...@@ -831,7 +825,9 @@ void probe_hwif (ide_hwif_t *hwif)
* PARANOIA!!! * PARANOIA!!!
*/ */
hwif->ide_dma_off_quietly(drive); hwif->ide_dma_off_quietly(drive);
if (enable_dma) #ifdef CONFIG_IDEDMA_ONLYDISK
if (drive->media == ide_disk)
#endif
hwif->ide_dma_check(drive); hwif->ide_dma_check(drive);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment