projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
dma
/
nbpfaxi.c
diff --git
a/drivers/dma/nbpfaxi.c
b/drivers/dma/nbpfaxi.c
index
08c45c1
..
09de715
100644
(file)
--- a/
drivers/dma/nbpfaxi.c
+++ b/
drivers/dma/nbpfaxi.c
@@
-1102,8
+1102,7
@@
static void nbpf_chan_tasklet(unsigned long data)
{
struct nbpf_channel *chan = (struct nbpf_channel *)data;
struct nbpf_desc *desc, *tmp;
{
struct nbpf_channel *chan = (struct nbpf_channel *)data;
struct nbpf_desc *desc, *tmp;
- dma_async_tx_callback callback;
- void *param;
+ struct dmaengine_desc_callback cb;
while (!list_empty(&chan->done)) {
bool found = false, must_put, recycling = false;
while (!list_empty(&chan->done)) {
bool found = false, must_put, recycling = false;
@@
-1151,14
+1150,12
@@
static void nbpf_chan_tasklet(unsigned long data)
must_put = false;
}
must_put = false;
}
- callback = desc->async_tx.callback;
- param = desc->async_tx.callback_param;
+ dmaengine_desc_get_callback(&desc->async_tx, &cb);
/* ack and callback completed descriptor */
spin_unlock_irq(&chan->lock);
/* ack and callback completed descriptor */
spin_unlock_irq(&chan->lock);
- if (callback)
- callback(param);
+ dmaengine_desc_callback_invoke(&cb, NULL);
if (must_put)
nbpf_desc_put(desc);
if (must_put)
nbpf_desc_put(desc);