Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a985e0 authored by Luciano Coelho's avatar Luciano Coelho Committed by Chris Ball
Browse files

mmc: omap: remove unnecessary #if 0's 



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: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 59911568

drivers/mmc/host/omap.c

+0 −16
Original line number Diff line number Diff line
@@ -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)