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/ti | |
| parent | da75ba2482658a0d9ea5245fadfea6b464fab7a3 (diff) | |
| parent | 86ae924a91a4a4297ad9f47e131f74b1dab6cb7a (diff) | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/ti')
| -rw-r--r-- | drivers/dma/ti/k3-udma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index de7bfc02a2de..3ce0eb2dfa22 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -2909,9 +2909,9 @@ static void udma_desc_pre_callback(struct virt_dma_chan *vc, * This tasklet handles the completion of a DMA descriptor by * calling its callback and freeing it. */ -static void udma_vchan_complete(unsigned long arg) +static void udma_vchan_complete(struct tasklet_struct *t) { - struct virt_dma_chan *vc = (struct virt_dma_chan *)arg; + struct virt_dma_chan *vc = from_tasklet(vc, t, task); struct virt_dma_desc *vd, *_vd; struct dmaengine_desc_callback cb; LIST_HEAD(head); @@ -3667,8 +3667,7 @@ static int udma_probe(struct platform_device *pdev) vchan_init(&uc->vc, &ud->ddev); /* Use custom vchan completion handling */ - tasklet_init(&uc->vc.task, udma_vchan_complete, - (unsigned long)&uc->vc); + tasklet_setup(&uc->vc.task, udma_vchan_complete); init_completion(&uc->teardown_completed); INIT_DELAYED_WORK(&uc->tx_drain.work, udma_check_tx_completion); } |