]> www.infradead.org Git - users/willy/xarray.git/commitdiff
dmaengine: Replace dma_request_slave_channel() by dma_request_chan()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 5 Feb 2025 14:57:09 +0000 (16:57 +0200)
committerVinod Koul <vkoul@kernel.org>
Mon, 10 Feb 2025 10:58:53 +0000 (16:28 +0530)
Replace dma_request_slave_channel() by dma_request_chan() as suggested
since the former is deprecated.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250205145757.889247-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/imx-sdma.c
include/linux/dmaengine.h

index 3449006cd14b56c3b65cfdff067a2e1379dae55f..02a85d6f1bea2df7d355858094c0c0b0bd07148e 100644 (file)
@@ -1459,9 +1459,8 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
         * dmatest, thus create 'struct imx_dma_data mem_data' for this case.
         * Please note in any other slave case, you have to setup chan->private
         * with 'struct imx_dma_data' in your own filter function if you want to
-        * request dma channel by dma_request_channel() rather than
-        * dma_request_slave_channel(). Othwise, 'MEMCPY in case?' will appear
-        * to warn you to correct your filter function.
+        * request DMA channel by dma_request_channel(), otherwise, 'MEMCPY in
+        * case?' will appear to warn you to correct your filter function.
         */
        if (!data) {
                dev_dbg(sdmac->sdma->dev, "MEMCPY in case?\n");
index 346251bf1026fdb76989be3c7cc94332785d8354..83cbf7197a76b1582302939e8838acf42879b5af 100644 (file)
@@ -1639,8 +1639,8 @@ static inline struct dma_chan
 {
        struct dma_chan *chan;
 
-       chan = dma_request_slave_channel(dev, name);
-       if (chan)
+       chan = dma_request_chan(dev, name);
+       if (!IS_ERR(chan))
                return chan;
 
        if (!fn || !fn_param)