summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorNicholas Graumann <nick.graumann@gmail.com>2019-10-15 16:48:19 +0200
committerVinod Koul <vkoul@kernel.org>2019-10-20 16:05:27 +0200
commit0f45e75e336f85aeee0392042e022814bf033aa2 (patch)
tree8a8f65cda989096e1d6470cd3101aac2f5b97975 /drivers/dma
parentdmaengine: xilinx_dma: Remove desc_callback_valid check (diff)
downloadlinux-0f45e75e336f85aeee0392042e022814bf033aa2.tar.xz
linux-0f45e75e336f85aeee0392042e022814bf033aa2.zip
dmaengine: xilinx_dma: Merge get_callback and _invoke
The dma api provides a single interface to get the appropriate callback and invoke it directly. Prefer using it. Signed-off-by: Nicholas Graumann <nick.graumann@gmail.com> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Link: https://lore.kernel.org/r/1571150904-3988-3-git-send-email-radhey.shyam.pandey@xilinx.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/xilinx/xilinx_dma.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 3e690ec45c13..87132bd8cd36 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -820,8 +820,6 @@ static void xilinx_dma_chan_desc_cleanup(struct xilinx_dma_chan *chan)
spin_lock_irqsave(&chan->lock, flags);
list_for_each_entry_safe(desc, next, &chan->done_list, node) {
- struct dmaengine_desc_callback cb;
-
if (desc->cyclic) {
xilinx_dma_chan_handle_cyclic(chan, desc, &flags);
break;
@@ -831,9 +829,8 @@ static void xilinx_dma_chan_desc_cleanup(struct xilinx_dma_chan *chan)
list_del(&desc->node);
/* Run the link descriptor callback function */
- dmaengine_desc_get_callback(&desc->async_tx, &cb);
spin_unlock_irqrestore(&chan->lock, flags);
- dmaengine_desc_callback_invoke(&cb, NULL);
+ dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);
spin_lock_irqsave(&chan->lock, flags);
/* Run any dependencies, then free the descriptor */