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

[linux-block.git] / drivers / dma / dma-jz4780.c

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index 6b8c4c458e8a39a0b9500804a3c0a4cb8f6e5839..7fe9309a876bde8fcb6e035dd0fd27baf464f333 100644 (file)
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -156,7 +156,6 @@ struct jz4780_dma_dev {
 };
 
 struct jz4780_dma_filter_data {
-       struct device_node *of_node;
        uint32_t transfer_type;
        int channel;
 };
@@ -772,8 +771,6 @@ static bool jz4780_dma_filter_fn(struct dma_chan *chan, void *param)
        struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan);
        struct jz4780_dma_filter_data *data = param;
 
-       if (jzdma->dma_device.dev->of_node != data->of_node)
-               return false;
 
        if (data->channel > -1) {
                if (data->channel != jzchan->id)
@@ -797,7 +794,6 @@ static struct dma_chan *jz4780_of_dma_xlate(struct of_phandle_args *dma_spec,
        if (dma_spec->args_count != 2)
                return NULL;
 
-       data.of_node = ofdma->of_node;
        data.transfer_type = dma_spec->args[0];
        data.channel = dma_spec->args[1];
 
@@ -822,7 +818,8 @@ static struct dma_chan *jz4780_of_dma_xlate(struct of_phandle_args *dma_spec,
                return dma_get_slave_channel(
                        &jzdma->chan[data.channel].vchan.chan);
        } else {
-               return dma_request_channel(mask, jz4780_dma_filter_fn, &data);
+               return __dma_request_channel(&mask, jz4780_dma_filter_fn, &data,
+                                            ofdma->of_node);
        }
 }