Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8c0697cc2c798fe11bbb9cf2dbe123892ecab91a
Commit:     8c0697cc2c798fe11bbb9cf2dbe123892ecab91a
Parent:     c223701cf6c706f42840631c1ca919a18e6e2800
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 22:29:58 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 22:29:58 2007 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/Kconfig     |   10 ----------
 drivers/ide/ide-probe.c |    5 +----
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 5fbd06b..6d9fd92 100644
--- 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 41e7a42..3c945d6 100644
--- 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);
                        }
                }
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to