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/imx-dma.c | |
| parent | da75ba2482658a0d9ea5245fadfea6b464fab7a3 (diff) | |
| parent | 86ae924a91a4a4297ad9f47e131f74b1dab6cb7a (diff) | |
| download | linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.tar.gz linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.tar.bz2 linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.zip | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/imx-dma.c')
| -rw-r--r-- | drivers/dma/imx-dma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 67ac2e68707e..670db04b0757 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -612,9 +612,9 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) return 0; } -static void imxdma_tasklet(unsigned long data) +static void imxdma_tasklet(struct tasklet_struct *t) { - struct imxdma_channel *imxdmac = (void *)data; + struct imxdma_channel *imxdmac = from_tasklet(imxdmac, t, dma_tasklet); struct imxdma_engine *imxdma = imxdmac->imxdma; struct imxdma_desc *desc, *next_desc; unsigned long flags; @@ -1168,8 +1168,7 @@ static int __init imxdma_probe(struct platform_device *pdev) INIT_LIST_HEAD(&imxdmac->ld_free); INIT_LIST_HEAD(&imxdmac->ld_active); - tasklet_init(&imxdmac->dma_tasklet, imxdma_tasklet, - (unsigned long)imxdmac); + tasklet_setup(&imxdmac->dma_tasklet, imxdma_tasklet); imxdmac->chan.device = &imxdma->dma_device; dma_cookie_init(&imxdmac->chan); imxdmac->channel = i; |