]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mmc: omap: remove unnecessary #if 0's
authorLuciano Coelho <coelho@ti.com>
Thu, 13 Jun 2013 15:25:55 +0000 (18:25 +0300)
committerChris Ball <cjb@laptop.org>
Fri, 5 Jul 2013 16:46:29 +0000 (12:46 -0400)
In commit 3451c067 (mmc: omap: add DMA engine support), some #if 0's
were used to comment out parts of the code.  This has been in the code
for over a year and are not needed anymore (and the commented-out code
doesn't even compile).  Remove them.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/omap.c

index 4b3e0eb77fe0f7b8cd48448bd24f5079ae588af9..b94f38ec2a838acff3f67861a8059eb22d41c2ff 100644 (file)
@@ -1413,33 +1413,17 @@ static int mmc_omap_probe(struct platform_device *pdev)
        else
                sig = host->id == 0 ? OMAP_DMA_MMC_TX : OMAP_DMA_MMC2_TX;
        host->dma_tx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
-#if 0
-       if (!host->dma_tx) {
-               dev_err(host->dev, "unable to obtain TX DMA engine channel %u\n",
-                       sig);
-               goto err_dma;
-       }
-#else
        if (!host->dma_tx)
                dev_warn(host->dev, "unable to obtain TX DMA engine channel %u\n",
                        sig);
-#endif
        if (mmc_omap2())
                sig = host->id == 0 ? OMAP24XX_DMA_MMC1_RX : OMAP24XX_DMA_MMC2_RX;
        else
                sig = host->id == 0 ? OMAP_DMA_MMC_RX : OMAP_DMA_MMC2_RX;
        host->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
-#if 0
-       if (!host->dma_rx) {
-               dev_err(host->dev, "unable to obtain RX DMA engine channel %u\n",
-                       sig);
-               goto err_dma;
-       }
-#else
        if (!host->dma_rx)
                dev_warn(host->dev, "unable to obtain RX DMA engine channel %u\n",
                        sig);
-#endif
 
        ret = request_irq(host->irq, mmc_omap_irq, 0, DRIVER_NAME, host);
        if (ret)