Skip to content

Commit

Permalink
mmc: usdhi6rol0: Use dma_request_chan() instead dma_request_slave_cha…
Browse files Browse the repository at this point in the history
…nnel()

dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.

By using dma_request_chan() directly the driver can support deferred
probing against DMA if needed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20191217113114.32085-1-peter.ujfalusi@ti.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Peter Ujfalusi authored and storulf committed Dec 19, 2019
1 parent b67b451 commit e6d82a7
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/mmc/host/usdhi6rol0.c
Expand Up @@ -676,12 +676,14 @@ static void usdhi6_dma_request(struct usdhi6_host *host, phys_addr_t start)
};
int ret;

host->chan_tx = dma_request_slave_channel(mmc_dev(host->mmc), "tx");
host->chan_tx = dma_request_chan(mmc_dev(host->mmc), "tx");
dev_dbg(mmc_dev(host->mmc), "%s: TX: got channel %p\n", __func__,
host->chan_tx);

if (!host->chan_tx)
if (IS_ERR(host->chan_tx)) {
host->chan_tx = NULL;
return;
}

cfg.direction = DMA_MEM_TO_DEV;
cfg.dst_addr = start + USDHI6_SD_BUF0;
Expand All @@ -691,12 +693,14 @@ static void usdhi6_dma_request(struct usdhi6_host *host, phys_addr_t start)
if (ret < 0)
goto e_release_tx;

host->chan_rx = dma_request_slave_channel(mmc_dev(host->mmc), "rx");
host->chan_rx = dma_request_chan(mmc_dev(host->mmc), "rx");
dev_dbg(mmc_dev(host->mmc), "%s: RX: got channel %p\n", __func__,
host->chan_rx);

if (!host->chan_rx)
if (IS_ERR(host->chan_rx)) {
host->chan_rx = NULL;
goto e_release_tx;
}

cfg.direction = DMA_DEV_TO_MEM;
cfg.src_addr = cfg.dst_addr;
Expand Down

0 comments on commit e6d82a7

Please sign in to comment.