Skip to contentSkip to conversation

ide: remove CONFIG_IDEDMA_ONLYDISK

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Aug 18, 2007 – Aug 19, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 6/7 ide: remove CONFIG_IDEDMA_ONLYDISK

ATAPI devices with broken DMA support should be handled by DMA blacklist and for debugging purposes we have new shiny "hdx=nodma" kernel paremeter.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/Kconfig     |   10 ----------
 drivers/ide/ide-probe.c |    5 +----
 2 files changed, 1 insertion(+), 14 deletions(-)
drivers/ide/Kconfig +0 -10
Index: b/drivers/ide/Kconfig
===================================================================
@@ -435,16 +435,6 @@ config BLK_DEV_IDEDMA_PCI
 	bool
 	select BLK_DEV_IDEPCI
 
-# TODO: remove it
-config IDEDMA_ONLYDISK
-	bool "Enable DMA only for disks "
-	depends on BLK_DEV_IDEDMA_PCI
-	help
-	  This is used if you know your ATAPI Devices are going to fail DMA
-	  Transfers.
-
-	  Generally say N here.
-
 config BLK_DEV_AEC62XX
 	tristate "AEC62XX chipset support"
 	select BLK_DEV_IDEDMA_PCI
drivers/ide/ide-probe.c +1 -4
Index: b/drivers/ide/ide-probe.c
===================================================================
@@ -843,10 +843,7 @@ static void probe_hwif(ide_hwif_t *hwif,
 				 *   PARANOIA!!!
 				 */
 				hwif->dma_off_quietly(drive);
-#ifdef CONFIG_IDEDMA_ONLYDISK
-				if (drive->media == ide_disk)
-#endif
-					ide_set_dma(drive);
+				ide_set_dma(drive);
 			}
 		}
 	}