mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload

Fix regression introduced by commit 796211b7953 ("mmc: atmel-mci: add
pdc support and runtime capabilities detection") which removed the need
for CONFIG_MMC_ATMELMCI_DMA but kept the Kconfig-entry as well as the
compile guards around dma_release_channel() in remove(). Consequently,
DMA is always enabled (if supported), but the DMA-channel is not
released on module unload unless the DMA-config option is selected.

Remove the no longer used CONFIG_MMC_ATMELMCI_DMA option completely.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

2 files changed, 0 insertions, 12 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d88219e1d86e..9c581c2ed349 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -300,16 +300,6 @@ config MMC_ATMELMCI
 
           If unsure, say N.
 
-config MMC_ATMELMCI_DMA
-        bool "Atmel MCI DMA support"
-        depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE
-        help
-          Say Y here to have the Atmel MCI driver use a DMA engine to
-          do data transfers and thus increase the throughput and
-          reduce the CPU utilization.
-
-          If unsure, say N.
-
 config MMC_MSM
         tristate "Qualcomm SDCC Controller Support"
         depends on MMC && ARCH_MSM
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 722af1de7967..10f8b7358e57 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2487,10 +2487,8 @@ static int __exit atmci_remove(struct platform_device *pdev)
         atmci_readl(host, ATMCI_SR);
         clk_disable(host->mck);
 
-#ifdef CONFIG_MMC_ATMELMCI_DMA
         if (host->dma.chan)
                 dma_release_channel(host->dma.chan);
-#endif
 
         free_irq(platform_get_irq(pdev, 0), host);
         iounmap(host->regs);