diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-10-01 10:18:59 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-10-01 10:18:59 +0530 |
| commit | a841592fb3a70bc3f3c2eaa2c1781479a52f76f9 (patch) | |
| tree | 9b18939a0d411779e0640e862ac2d1b353b23cb7 /drivers/dma/iop-adma.c | |
| parent | da75ba2482658a0d9ea5245fadfea6b464fab7a3 (diff) | |
| parent | 86ae924a91a4a4297ad9f47e131f74b1dab6cb7a (diff) | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 48d56c9f3619..310b899d581f 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c @@ -238,9 +238,10 @@ iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan) spin_unlock_bh(&iop_chan->lock); } -static void iop_adma_tasklet(unsigned long data) +static void iop_adma_tasklet(struct tasklet_struct *t) { - struct iop_adma_chan *iop_chan = (struct iop_adma_chan *) data; + struct iop_adma_chan *iop_chan = from_tasklet(iop_chan, t, + irq_tasklet); /* lockdep will flag depedency submissions as potentially * recursive locking, this is not the case as a dependency @@ -1350,8 +1351,7 @@ static int iop_adma_probe(struct platform_device *pdev) ret = -ENOMEM; goto err_free_iop_chan; } - tasklet_init(&iop_chan->irq_tasklet, iop_adma_tasklet, (unsigned long) - iop_chan); + tasklet_setup(&iop_chan->irq_tasklet, iop_adma_tasklet); /* clear errors before enabling interrupts */ iop_adma_device_clear_err_status(iop_chan); |