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/timb_dma.c | |
| parent | dmaengine: dmatest: Return boolean result directly in filter() (diff) | |
| parent | dmaengine: pl330: fix argument for tasklet (diff) | |
| download | linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.tar.gz linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.tar.bz2 linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.zip | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/timb_dma.c')
| -rw-r--r-- | drivers/dma/timb_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index 68e48bf54d78..3f524be69efb 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c @@ -563,9 +563,9 @@ static int td_terminate_all(struct dma_chan *chan) return 0; } -static void td_tasklet(unsigned long data) +static void td_tasklet(struct tasklet_struct *t) { - struct timb_dma *td = (struct timb_dma *)data; + struct timb_dma *td = from_tasklet(td, t, tasklet); u32 isr; u32 ipr; u32 ier; @@ -658,7 +658,7 @@ static int td_probe(struct platform_device *pdev) iowrite32(0x0, td->membase + TIMBDMA_IER); iowrite32(0xFFFFFFFF, td->membase + TIMBDMA_ISR); - tasklet_init(&td->tasklet, td_tasklet, (unsigned long)td); + tasklet_setup(&td->tasklet, td_tasklet); err = request_irq(irq, td_irq, IRQF_SHARED, DRIVER_NAME, td); if (err) { |