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.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 5fbd06b7893d714e68e424aabed5e2d3ac85546c..6d9fd92763f46bf853bacbf091c92be3d1294c92 100644 (file)
--- a/drivers/ide/Kconfig
+++ 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

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 41e7a4229fc4fc9c96fc8c30412945d04180ace6..3c945d64d8458c01dbdc6e2e35a7cc69a9203494 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -843,10 +843,7 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(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);
                        }
                }
        }