dmaengine: pl330: 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 <allen.lkml@gmail.com>
Link: https://lore.kernel.org/r/20200831103542.305571-21-allen.lkml@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 000c3c4..d98fb31 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1573,9 +1573,9 @@ static void dma_pl330_rqcb(struct dma_pl330_desc *desc, enum pl330_op_err err)
        tasklet_schedule(&pch->task);
 }
 
-static void pl330_dotask(unsigned long data)
+static void pl330_dotask(struct tasklet_struct *t)
 {
-       struct pl330_dmac *pl330 = (struct pl330_dmac *) data;
+       struct pl330_dmac *pl330 = from_tasklet(pl330, t, tasks);
        unsigned long flags;
        int i;
 
@@ -1979,7 +1979,7 @@ static int pl330_add(struct pl330_dmac *pl330)
                return ret;
        }
 
-       tasklet_init(&pl330->tasks, pl330_dotask, (unsigned long) pl330);
+       tasklet_setup(&pl330->tasks, pl330_dotask);
 
        pl330->state = INIT;
 
@@ -2062,9 +2062,9 @@ static inline void fill_queue(struct dma_pl330_chan *pch)
        }
 }
 
-static void pl330_tasklet(unsigned long data)
+static void pl330_tasklet(struct tasklet_struct *t)
 {
-       struct dma_pl330_chan *pch = (struct dma_pl330_chan *)data;
+       struct dma_pl330_chan *pch = from_tasklet(pch, t, task);
        struct dma_pl330_desc *desc, *_dt;
        unsigned long flags;
        bool power_down = false;
@@ -2172,7 +2172,7 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan)
                return -ENOMEM;
        }
 
-       tasklet_init(&pch->task, pl330_tasklet, (unsigned long) pch);
+       tasklet_setup(&pch->task, pl330_tasklet);
 
        spin_unlock_irqrestore(&pl330->lock, flags);