dmaengine: ste_dma40: 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>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 8b18e44a02d51438809216a6d1b16e002d60fbde..73203ac837346ea0eb4a2b1074ed18e0d8a9eb39 100644 (file)
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -1596,8 +1596,7 @@ static void dma_tasklet(unsigned long data)
        struct d40_desc *d40d;
        unsigned long flags;
        bool callback_active;
-       dma_async_tx_callback callback;
-       void *callback_param;
+       struct dmaengine_desc_callback cb;
 
        spin_lock_irqsave(&d40c->lock, flags);
 
@@ -1624,8 +1623,7 @@ static void dma_tasklet(unsigned long data)
 
        /* Callback to client */
        callback_active = !!(d40d->txd.flags & DMA_PREP_INTERRUPT);
-       callback = d40d->txd.callback;
-       callback_param = d40d->txd.callback_param;
+       dmaengine_desc_get_callback(&d40d->txd, &cb);
 
        if (!d40d->cyclic) {
                if (async_tx_test_ack(&d40d->txd)) {
@@ -1646,8 +1644,8 @@ static void dma_tasklet(unsigned long data)
 
        spin_unlock_irqrestore(&d40c->lock, flags);
 
-       if (callback_active && callback)
-               callback(callback_param);
+       if (callback_active)
+               dmaengine_desc_callback_invoke(&cb, NULL);
 
        return;