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

[linux-2.6-block.git] / drivers / dma / mmp_tdma.c

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index bb3ccbf90a318d745fdc167598bf9da8a03475da..e7d1e12bf4643e3ae9a35e1cd9881a2505a1c34a 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -582,18 +582,12 @@ static int mmp_tdma_chan_init(struct mmp_tdma_device *tdev,
 }
 
 struct mmp_tdma_filter_param {
-       struct device_node *of_node;
        unsigned int chan_id;
 };
 
 static bool mmp_tdma_filter_fn(struct dma_chan *chan, void *fn_param)
 {
        struct mmp_tdma_filter_param *param = fn_param;
-       struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
-       struct dma_device *pdma_device = tdmac->chan.device;
-
-       if (pdma_device->dev->of_node != param->of_node)
-               return false;
 
        if (chan->chan_id != param->chan_id)
                return false;
@@ -611,13 +605,13 @@ static struct dma_chan *mmp_tdma_xlate(struct of_phandle_args *dma_spec,
        if (dma_spec->args_count != 1)
                return NULL;
 
-       param.of_node = ofdma->of_node;
        param.chan_id = dma_spec->args[0];
 
        if (param.chan_id >= TDMA_CHANNEL_NUM)
                return NULL;
 
-       return dma_request_channel(mask, mmp_tdma_filter_fn, &param);
+       return __dma_request_channel(&mask, mmp_tdma_filter_fn, &param,
+                                    ofdma->of_node);
 }
 
 static const struct of_device_id mmp_tdma_dt_ids[] = {