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/mediatek | |
| parent | da75ba2482658a0d9ea5245fadfea6b464fab7a3 (diff) | |
| parent | 86ae924a91a4a4297ad9f47e131f74b1dab6cb7a (diff) | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/mediatek')
| -rw-r--r-- | drivers/dma/mediatek/mtk-cqdma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/mediatek/mtk-cqdma.c b/drivers/dma/mediatek/mtk-cqdma.c index 6bf838e63be1..41ef9f15d3d5 100644 --- a/drivers/dma/mediatek/mtk-cqdma.c +++ b/drivers/dma/mediatek/mtk-cqdma.c @@ -356,9 +356,9 @@ static struct mtk_cqdma_vdesc return ret; } -static void mtk_cqdma_tasklet_cb(unsigned long data) +static void mtk_cqdma_tasklet_cb(struct tasklet_struct *t) { - struct mtk_cqdma_pchan *pc = (struct mtk_cqdma_pchan *)data; + struct mtk_cqdma_pchan *pc = from_tasklet(pc, t, tasklet); struct mtk_cqdma_vdesc *cvd = NULL; unsigned long flags; @@ -878,8 +878,7 @@ static int mtk_cqdma_probe(struct platform_device *pdev) /* initialize tasklet for each PC */ for (i = 0; i < cqdma->dma_channels; ++i) - tasklet_init(&cqdma->pc[i]->tasklet, mtk_cqdma_tasklet_cb, - (unsigned long)cqdma->pc[i]); + tasklet_setup(&cqdma->pc[i]->tasklet, mtk_cqdma_tasklet_cb); dev_info(&pdev->dev, "MediaTek CQDMA driver registered\n"); |