ide: remove CONFIG_IDEDMA_{ICS,PCI}_AUTO config options

All modern distributions have been setting these options to "y" for ages.
(additionally "n" cases have been obsoleted for few years).  Therefore use
DMA by default and remove CONFIG_IDEDMA_{ICS,PCI}_AUTO (also remove no longer
needed CONFIG_IDEDMA_AUTO).  This fixes DMA support for rare configurations
where CONFIG_IDEDMA_{ICS,PCI}_AUTO was set to "n" but "hdparm -d 1" was used
to enable DMA support and which were forced to PIO mode by "ide: don't allow
DMA to be enabled if CONFIG_IDEDMA_{ICS,PCI}_AUTO=n" patch.  There is no
functionality loss because "ide=nodma" kernel option is still available.

Cc: Patrick Horn <phrh@yahoo.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 98a1ff23c34a1c338b1e677ccba90d87b143764a..8f1fd017679b4201daafd858d3708fc171097903 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -434,24 +434,8 @@ config BLK_DEV_IDEDMA_FORCED
 
          Generally say N here.
 
 
          Generally say N here.
 

-config IDEDMA_PCI_AUTO
-       bool "Use PCI DMA by default when available"
-       ---help---
-         Prior to kernel version 2.1.112, Linux used to automatically use
-         DMA for IDE drives and chipsets which support it. Due to concerns
-         about a couple of cases where buggy hardware may have caused damage,
-         the default is now to NOT use DMA automatically. To revert to the
-         previous behaviour, say Y to this question.
-
-         If you suspect your hardware is at all flakey, say N here.
-         Do NOT email the IDE kernel people regarding this issue!
-
-         It is normally safe to answer Y to this question unless your
-         motherboard uses a VIA VP2 chipset, in which case you should say N.
-

 config IDEDMA_ONLYDISK
        bool "Enable DMA only for disks "
 config IDEDMA_ONLYDISK
        bool "Enable DMA only for disks "

-       depends on IDEDMA_PCI_AUTO

        help
          This is used if you know your ATAPI Devices are going to fail DMA
          Transfers.
        help
          This is used if you know your ATAPI Devices are going to fail DMA
          Transfers.


@@ -851,19 +835,6 @@ config BLK_DEV_IDEDMA_ICS
          Say Y here if you want to add DMA (Direct Memory Access) support to
          the ICS IDE driver.
 
          Say Y here if you want to add DMA (Direct Memory Access) support to
          the ICS IDE driver.
 

-config IDEDMA_ICS_AUTO
-       bool "Use ICS DMA by default"
-       depends on BLK_DEV_IDEDMA_ICS
-       help
-         Prior to kernel version 2.1.112, Linux used to automatically use
-         DMA for IDE drives and chipsets which support it. Due to concerns
-         about a couple of cases where buggy hardware may have caused damage,
-         the default is now to NOT use DMA automatically. To revert to the
-         previous behaviour, say Y to this question.
-
-         If you suspect your hardware is at all flakey, say N here.
-         Do NOT email the IDE kernel people regarding this issue!
-

 config BLK_DEV_IDE_RAPIDE
        tristate "RapIDE interface support"
        depends on ARM && ARCH_ACORN
 config BLK_DEV_IDE_RAPIDE
        tristate "RapIDE interface support"
        depends on ARM && ARCH_ACORN


@@ -1086,9 +1057,6 @@ config IDEDMA_IVB
 
          It is normally safe to answer Y; however, the default is N.
 
 
          It is normally safe to answer Y; however, the default is N.
 

-config IDEDMA_AUTO
-       def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO
-

 endif
 
 config BLK_DEV_HD_ONLY
 endif
 
 config BLK_DEV_HD_ONLY

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 40e5c66b81ce58fea8c22c5d74b2d060cfc1c35c..e2953fc1fafbc175bb87bac04e9acf94a28944e2 100644 (file)
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -196,11 +196,6 @@ static void icside_maskproc(ide_drive_t *drive, int mask)
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_ICS
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_ICS

-
-#ifndef CONFIG_IDEDMA_ICS_AUTO
-#warning CONFIG_IDEDMA_ICS_AUTO=n support is obsolete, and will be removed soon.
-#endif
-

 /*
  * SG-DMA support.
  *
 /*
  * SG-DMA support.
  *


@@ -474,12 +469,6 @@ static int icside_dma_lostirq(ide_drive_t *drive)
 
 static void icside_dma_init(ide_hwif_t *hwif)
 {
 
 static void icside_dma_init(ide_hwif_t *hwif)
 {

-       int autodma = 0;
-
-#ifdef CONFIG_IDEDMA_ICS_AUTO
-       autodma = 1;
-#endif
-

        printk("    %s: SG-DMA", hwif->name);
 
        hwif->atapi_dma         = 1;
        printk("    %s: SG-DMA", hwif->name);
 
        hwif->atapi_dma         = 1;


@@ -489,7 +478,7 @@ static void icside_dma_init(ide_hwif_t *hwif)
        hwif->dmatable_cpu      = NULL;
        hwif->dmatable_dma      = 0;
        hwif->speedproc         = icside_set_speed;
        hwif->dmatable_cpu      = NULL;
        hwif->dmatable_dma      = 0;
        hwif->speedproc         = icside_set_speed;

-       hwif->autodma           = autodma;
+       hwif->autodma           = 1;

 
        hwif->ide_dma_check     = icside_dma_check;
        hwif->dma_host_off      = icside_dma_host_off;
 
        hwif->ide_dma_check     = icside_dma_check;
        hwif->dma_host_off      = icside_dma_host_off;

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index dfbd7445852234dff93f9e30534cac343afb72db..695610f0e3e4b4eaa49cfc024e6e07694fae15c5 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -177,11 +177,7 @@ DECLARE_MUTEX(ide_cfg_sem);
 static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
 #endif
 
 static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
 #endif
 

-#ifdef CONFIG_IDEDMA_AUTO

 int noautodma = 0;
 int noautodma = 0;

-#else
-int noautodma = 1;
-#endif

 
 EXPORT_SYMBOL(noautodma);
 
 
 EXPORT_SYMBOL(noautodma);
 

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index a52c80fe7d3e5d6e05a3995d5dd75af9965e3fe7..118fb3205ca81cda6f4f260bedeea806883ffa4d 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -505,11 +505,6 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
                }
        }
 }
                }
        }
 }

-
-#ifndef CONFIG_IDEDMA_PCI_AUTO
-#warning CONFIG_IDEDMA_PCI_AUTO=n support is obsolete, and will be removed soon.
-#endif
-

 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
 
 /**
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
 
 /**