Merge tag 'nios2-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[karo-tx-linux.git] / drivers / dma / pch_dma.c

diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 113605f6fe20876495f0629d4cb16905471eb111..df95727dc2fbaeb3c16f2511e60327360c3995fc 100644 (file)
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -357,14 +357,13 @@ static void pdc_chain_complete(struct pch_dma_chan *pd_chan,
                               struct pch_dma_desc *desc)
 {
        struct dma_async_tx_descriptor *txd = &desc->txd;
-       dma_async_tx_callback callback = txd->callback;
-       void *param = txd->callback_param;
+       struct dmaengine_desc_callback cb;
 
+       dmaengine_desc_get_callback(txd, &cb);
        list_splice_init(&desc->tx_list, &pd_chan->free_list);
        list_move(&desc->desc_node, &pd_chan->free_list);
 
-       if (callback)
-               callback(param);
+       dmaengine_desc_callback_invoke(&cb, NULL);
 }
 
 static void pdc_complete_all(struct pch_dma_chan *pd_chan)