mmc: usdhi6rol0: Use dma_request_chan() instead dma_request_slave_channel()
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 17 Dec 2019 11:31:14 +0000 (13:31 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 19 Dec 2019 07:19:42 +0000 (08:19 +0100)
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>
drivers/mmc/host/usdhi6rol0.c

index 969a34e..9a0b1e4 100644 (file)
@@ -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;
@@ -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;