dmaengine: pl330: convert callback to helper function

This is in preperation of moving to a callback that provides results to the
callback for the transaction. The conversion will maintain current behavior
and the driver must convert to new callback mechanism at a later time in
order to receive results.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 4fc3ffbd5ca0d0a36b489eceba61091b323228e3..1ecd4674aa2367097f086425686216d1d99eff97 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2039,14 +2039,12 @@ static void pl330_tasklet(unsigned long data)
        }
 
        while (!list_empty(&pch->completed_list)) {
-               dma_async_tx_callback callback;
-               void *callback_param;
+               struct dmaengine_desc_callback cb;
 
                desc = list_first_entry(&pch->completed_list,
                                        struct dma_pl330_desc, node);
 
-               callback = desc->txd.callback;
-               callback_param = desc->txd.callback_param;
+               dmaengine_desc_get_callback(&desc->txd, &cb);
 
                if (pch->cyclic) {
                        desc->status = PREP;
@@ -2064,9 +2062,9 @@ static void pl330_tasklet(unsigned long data)
 
                dma_descriptor_unmap(&desc->txd);
 
-               if (callback) {
+               if (dmaengine_desc_callback_valid(&cb)) {
                        spin_unlock_irqrestore(&pch->lock, flags);
-                       callback(callback_param);
+                       dmaengine_desc_callback_invoke(&cb, NULL);
                        spin_lock_irqsave(&pch->lock, flags);
                }
        }