aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mmci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r--drivers/mmc/host/mmci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 8232e9a02d40..7fe16194ebc8 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -430,7 +430,6 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)
430static void mmci_dma_setup(struct mmci_host *host) 430static void mmci_dma_setup(struct mmci_host *host)
431{ 431{
432 const char *rxname, *txname; 432 const char *rxname, *txname;
433 dma_cap_mask_t mask;
434 struct variant_data *variant = host->variant; 433 struct variant_data *variant = host->variant;
435 434
436 host->dma_rx_channel = dma_request_slave_channel(mmc_dev(host->mmc), "rx"); 435 host->dma_rx_channel = dma_request_slave_channel(mmc_dev(host->mmc), "rx");
@@ -439,10 +438,6 @@ static void mmci_dma_setup(struct mmci_host *host)
439 /* initialize pre request cookie */ 438 /* initialize pre request cookie */
440 host->next_data.cookie = 1; 439 host->next_data.cookie = 1;
441 440
442 /* Try to acquire a generic DMA engine slave channel */
443 dma_cap_zero(mask);
444 dma_cap_set(DMA_SLAVE, mask);
445
446 /* 441 /*
447 * If only an RX channel is specified, the driver will 442 * If only an RX channel is specified, the driver will
448 * attempt to use it bidirectionally, however if it is 443 * attempt to use it bidirectionally, however if it is
@@ -1739,10 +1734,10 @@ static int mmci_probe(struct amba_device *dev,
1739 1734
1740 pm_runtime_set_autosuspend_delay(&dev->dev, 50); 1735 pm_runtime_set_autosuspend_delay(&dev->dev, 50);
1741 pm_runtime_use_autosuspend(&dev->dev); 1736 pm_runtime_use_autosuspend(&dev->dev);
1742 pm_runtime_put(&dev->dev);
1743 1737
1744 mmc_add_host(mmc); 1738 mmc_add_host(mmc);
1745 1739
1740 pm_runtime_put(&dev->dev);
1746 return 0; 1741 return 0;
1747 1742
1748 clk_disable: 1743 clk_disable: