Merge tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-microblaze.git] / drivers / dma / imx-sdma.c

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 4ec84a6..a01f4b5 100644 (file)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1934,16 +1934,11 @@ disable_clk_ipg:
 static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param)
 {
        struct sdma_channel *sdmac = to_sdma_chan(chan);
-       struct sdma_engine *sdma = sdmac->sdma;
        struct imx_dma_data *data = fn_param;
 
        if (!imx_dma_is_general_purpose(chan))
                return false;
 
-       /* return false if it's not the right device */
-       if (sdma->dev->of_node != data->of_node)
-               return false;
-
        sdmac->data = *data;
        chan->private = &sdmac->data;
 
@@ -1971,9 +1966,9 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec,
         * be set to sdmac->event_id1.
         */
        data.dma_request2 = 0;
-       data.of_node = ofdma->of_node;
 
-       return dma_request_channel(mask, sdma_filter_fn, &data);
+       return __dma_request_channel(&mask, sdma_filter_fn, &data,
+                                    ofdma->of_node);
 }
 
 static int sdma_probe(struct platform_device *pdev)