diff options
author | Luciano Coelho <coelho@ti.com> | 2013-06-13 11:25:55 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-07-05 12:46:29 -0400 |
commit | d7a985e08fe84307430090b8604f5652080cc930 (patch) | |
tree | 05237783e04aba221351f804534d136c9da09f65 /drivers/mmc/host/omap.c | |
parent | 599115686d8f62999a871f7d7ee87de3b939b258 (diff) |
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: Luciano Coelho <coelho@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/omap.c')
-rw-r--r-- | drivers/mmc/host/omap.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 4b3e0eb77fe0..b94f38ec2a83 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -1413,33 +1413,17 @@ static int mmc_omap_probe(struct platform_device *pdev) | |||
1413 | else | 1413 | else |
1414 | sig = host->id == 0 ? OMAP_DMA_MMC_TX : OMAP_DMA_MMC2_TX; | 1414 | sig = host->id == 0 ? OMAP_DMA_MMC_TX : OMAP_DMA_MMC2_TX; |
1415 | host->dma_tx = dma_request_channel(mask, omap_dma_filter_fn, &sig); | 1415 | host->dma_tx = dma_request_channel(mask, omap_dma_filter_fn, &sig); |
1416 | #if 0 | ||
1417 | if (!host->dma_tx) { | ||
1418 | dev_err(host->dev, "unable to obtain TX DMA engine channel %u\n", | ||
1419 | sig); | ||
1420 | goto err_dma; | ||
1421 | } | ||
1422 | #else | ||
1423 | if (!host->dma_tx) | 1416 | if (!host->dma_tx) |
1424 | dev_warn(host->dev, "unable to obtain TX DMA engine channel %u\n", | 1417 | dev_warn(host->dev, "unable to obtain TX DMA engine channel %u\n", |
1425 | sig); | 1418 | sig); |
1426 | #endif | ||
1427 | if (mmc_omap2()) | 1419 | if (mmc_omap2()) |
1428 | sig = host->id == 0 ? OMAP24XX_DMA_MMC1_RX : OMAP24XX_DMA_MMC2_RX; | 1420 | sig = host->id == 0 ? OMAP24XX_DMA_MMC1_RX : OMAP24XX_DMA_MMC2_RX; |
1429 | else | 1421 | else |
1430 | sig = host->id == 0 ? OMAP_DMA_MMC_RX : OMAP_DMA_MMC2_RX; | 1422 | sig = host->id == 0 ? OMAP_DMA_MMC_RX : OMAP_DMA_MMC2_RX; |
1431 | host->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig); | 1423 | host->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig); |
1432 | #if 0 | ||
1433 | if (!host->dma_rx) { | ||
1434 | dev_err(host->dev, "unable to obtain RX DMA engine channel %u\n", | ||
1435 | sig); | ||
1436 | goto err_dma; | ||
1437 | } | ||
1438 | #else | ||
1439 | if (!host->dma_rx) | 1424 | if (!host->dma_rx) |
1440 | dev_warn(host->dev, "unable to obtain RX DMA engine channel %u\n", | 1425 | dev_warn(host->dev, "unable to obtain RX DMA engine channel %u\n", |
1441 | sig); | 1426 | sig); |
1442 | #endif | ||
1443 | 1427 | ||
1444 | ret = request_irq(host->irq, mmc_omap_irq, 0, DRIVER_NAME, host); | 1428 | ret = request_irq(host->irq, mmc_omap_irq, 0, DRIVER_NAME, host); |
1445 | if (ret) | 1429 | if (ret) |