Merge tag 'x86-splitlock-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c
index 321ac3a..9a841ce 100644 (file)
--- a/drivers/dma/altera-msgdma.c
+++ b/drivers/dma/altera-msgdma.c
@@ -678,11 +678,11 @@ static int msgdma_alloc_chan_resources(struct dma_chan *dchan)
 
 /**
  * msgdma_tasklet - Schedule completion tasklet
- * @data: Pointer to the Altera sSGDMA channel structure
+ * @t: Pointer to the Altera sSGDMA channel structure
  */
-static void msgdma_tasklet(unsigned long data)
+static void msgdma_tasklet(struct tasklet_struct *t)
 {
-       struct msgdma_device *mdev = (struct msgdma_device *)data;
+       struct msgdma_device *mdev = from_tasklet(mdev, t, irq_tasklet);
        u32 count;
        u32 __maybe_unused size;
        u32 __maybe_unused status;
@@ -830,7 +830,7 @@ static int msgdma_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       tasklet_init(&mdev->irq_tasklet, msgdma_tasklet, (unsigned long)mdev);
+       tasklet_setup(&mdev->irq_tasklet, msgdma_tasklet);
 
        dma_cookie_init(&mdev->dmachan);