Merge branch 'topic/err_reporting' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Conflicts:
	drivers/dma/cppi41.c

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c
index 496ff8e7d7f9..40c58ae80660 100644
--- a/drivers/dma/fsl_raid.c
+++ b/drivers/dma/fsl_raid.c
@@ -134,16 +134,8 @@ static void fsl_re_issue_pending(struct dma_chan *chan)
 
 static void fsl_re_desc_done(struct fsl_re_desc *desc)
 {
-        dma_async_tx_callback callback;
-        void *callback_param;
-
         dma_cookie_complete(&desc->async_tx);
-
-        callback = desc->async_tx.callback;
-        callback_param = desc->async_tx.callback_param;
-        if (callback)
-                callback(callback_param);
-
+        dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);
         dma_descriptor_unmap(&desc->async_tx);
 }