diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:33 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:33 +0530 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/dma/ste_dma40.c | |
| parent | 0a98f4b857e9aedf426d8b5b07699a8526e07530 (diff) | |
| parent | 793ae66c7dcc7e6655029f6613221a111b15b58e (diff) | |
| download | linux-0-day-11bfedff5594eef74617e6aa02986cf517526b98.tar.gz linux-0-day-11bfedff5594eef74617e6aa02986cf517526b98.tar.xz | |
Merge branch 'topic/err_reporting' into for-linus
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/cppi41.c
Diffstat (limited to 'drivers/dma/ste_dma40.c')
| -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 e43d2bbfd122d..08f3d7be2df04 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1570,8 +1570,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); @@ -1598,8 +1597,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)) { @@ -1620,8 +1618,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; |