dmaengine: sf-pdma: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
Link: https://lore.kernel.org/r/20201006050458.221329-1-allen.lkml@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index 1e66c69..528deb5 100644 (file)
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -281,9 +281,9 @@ static void sf_pdma_free_desc(struct virt_dma_desc *vdesc)
        desc->in_use = false;
 }
 
-static void sf_pdma_donebh_tasklet(unsigned long arg)
+static void sf_pdma_donebh_tasklet(struct tasklet_struct *t)
 {
-       struct sf_pdma_chan *chan = (struct sf_pdma_chan *)arg;
+       struct sf_pdma_chan *chan = from_tasklet(chan, t, done_tasklet);
        unsigned long flags;
 
        spin_lock_irqsave(&chan->lock, flags);
@@ -300,9 +300,9 @@ static void sf_pdma_donebh_tasklet(unsigned long arg)
        spin_unlock_irqrestore(&chan->vchan.lock, flags);
 }
 
-static void sf_pdma_errbh_tasklet(unsigned long arg)
+static void sf_pdma_errbh_tasklet(struct tasklet_struct *t)
 {
-       struct sf_pdma_chan *chan = (struct sf_pdma_chan *)arg;
+       struct sf_pdma_chan *chan = from_tasklet(chan, t, err_tasklet);
        struct sf_pdma_desc *desc = chan->desc;
        unsigned long flags;
 
@@ -475,10 +475,8 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)
 
                writel(PDMA_CLEAR_CTRL, chan->regs.ctrl);
 
-               tasklet_init(&chan->done_tasklet,
-                            sf_pdma_donebh_tasklet, (unsigned long)chan);
-               tasklet_init(&chan->err_tasklet,
-                            sf_pdma_errbh_tasklet, (unsigned long)chan);
+               tasklet_setup(&chan->done_tasklet, sf_pdma_donebh_tasklet);
+               tasklet_setup(&chan->err_tasklet, sf_pdma_errbh_tasklet);
        }
 }