Skip to content

Commit 59cd818

Browse files
Allen Paisvinodkoul
authored andcommitted
dmaengine: fsl: 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/20200831134745.314945-1-allen.lkml@gmail.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 2fa9bc9 commit 59cd818

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/dma/fsl_raid.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ static void fsl_re_cleanup_descs(struct fsl_re_chan *re_chan)
154154
fsl_re_issue_pending(&re_chan->chan);
155155
}
156156

157-
static void fsl_re_dequeue(unsigned long data)
157+
static void fsl_re_dequeue(struct tasklet_struct *t)
158158
{
159-
struct fsl_re_chan *re_chan;
159+
struct fsl_re_chan *re_chan = from_tasklet(re_chan, t, irqtask);
160160
struct fsl_re_desc *desc, *_desc;
161161
struct fsl_re_hw_desc *hwdesc;
162162
unsigned long flags;
@@ -671,7 +671,7 @@ static int fsl_re_chan_probe(struct platform_device *ofdev,
671671
snprintf(chan->name, sizeof(chan->name), "re_jr%02d", q);
672672

673673
chandev = &chan_ofdev->dev;
674-
tasklet_init(&chan->irqtask, fsl_re_dequeue, (unsigned long)chandev);
674+
tasklet_setup(&chan->irqtask, fsl_re_dequeue);
675675

676676
ret = request_irq(chan->irq, fsl_re_isr, 0, chan->name, chandev);
677677
if (ret) {

drivers/dma/fsldma.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -976,9 +976,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
976976
return IRQ_HANDLED;
977977
}
978978

979-
static void dma_do_tasklet(unsigned long data)
979+
static void dma_do_tasklet(struct tasklet_struct *t)
980980
{
981-
struct fsldma_chan *chan = (struct fsldma_chan *)data;
981+
struct fsldma_chan *chan = from_tasklet(chan, t, tasklet);
982982

983983
chan_dbg(chan, "tasklet entry\n");
984984

@@ -1151,7 +1151,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
11511151
}
11521152

11531153
fdev->chan[chan->id] = chan;
1154-
tasklet_init(&chan->tasklet, dma_do_tasklet, (unsigned long)chan);
1154+
tasklet_setup(&chan->tasklet, dma_do_tasklet);
11551155
snprintf(chan->name, sizeof(chan->name), "chan%d", chan->id);
11561156

11571157
/* Initialize the channel */

0 commit comments

Comments
 (0)