Merge tag 'audit-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux-2.6-microblaze.git] / drivers / dma / timb_dma.c

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 68e48bf..3f524be 100644 (file)
--- 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) {