diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2016-07-20 13:13:10 -0700 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-08-08 08:11:41 +0530 |
| commit | 3a315d5d4b3ba18062e8c5f0cfa5373768cb91d6 (patch) | |
| tree | 613889096e6cc8b70fe64c1de49512b4bcdf2bdb /drivers/dma | |
| parent | b8bdebb98a56c953808388295670f79b88313fd1 (diff) | |
| download | linux-stable-3a315d5d4b3ba18062e8c5f0cfa5373768cb91d6.tar.gz linux-stable-3a315d5d4b3ba18062e8c5f0cfa5373768cb91d6.tar.bz2 linux-stable-3a315d5d4b3ba18062e8c5f0cfa5373768cb91d6.zip | |
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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 8b18e44a02d5..73203ac83734 100644 --- 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; |