mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
2fa9bc98b5
commit
59cd818763
|
@ -154,9 +154,9 @@ static void fsl_re_cleanup_descs(struct fsl_re_chan *re_chan)
|
||||||
fsl_re_issue_pending(&re_chan->chan);
|
fsl_re_issue_pending(&re_chan->chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fsl_re_dequeue(unsigned long data)
|
static void fsl_re_dequeue(struct tasklet_struct *t)
|
||||||
{
|
{
|
||||||
struct fsl_re_chan *re_chan;
|
struct fsl_re_chan *re_chan = from_tasklet(re_chan, t, irqtask);
|
||||||
struct fsl_re_desc *desc, *_desc;
|
struct fsl_re_desc *desc, *_desc;
|
||||||
struct fsl_re_hw_desc *hwdesc;
|
struct fsl_re_hw_desc *hwdesc;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -671,7 +671,7 @@ static int fsl_re_chan_probe(struct platform_device *ofdev,
|
||||||
snprintf(chan->name, sizeof(chan->name), "re_jr%02d", q);
|
snprintf(chan->name, sizeof(chan->name), "re_jr%02d", q);
|
||||||
|
|
||||||
chandev = &chan_ofdev->dev;
|
chandev = &chan_ofdev->dev;
|
||||||
tasklet_init(&chan->irqtask, fsl_re_dequeue, (unsigned long)chandev);
|
tasklet_setup(&chan->irqtask, fsl_re_dequeue);
|
||||||
|
|
||||||
ret = request_irq(chan->irq, fsl_re_isr, 0, chan->name, chandev);
|
ret = request_irq(chan->irq, fsl_re_isr, 0, chan->name, chandev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
|
@ -976,9 +976,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dma_do_tasklet(unsigned long data)
|
static void dma_do_tasklet(struct tasklet_struct *t)
|
||||||
{
|
{
|
||||||
struct fsldma_chan *chan = (struct fsldma_chan *)data;
|
struct fsldma_chan *chan = from_tasklet(chan, t, tasklet);
|
||||||
|
|
||||||
chan_dbg(chan, "tasklet entry\n");
|
chan_dbg(chan, "tasklet entry\n");
|
||||||
|
|
||||||
|
@ -1151,7 +1151,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
|
||||||
}
|
}
|
||||||
|
|
||||||
fdev->chan[chan->id] = chan;
|
fdev->chan[chan->id] = chan;
|
||||||
tasklet_init(&chan->tasklet, dma_do_tasklet, (unsigned long)chan);
|
tasklet_setup(&chan->tasklet, dma_do_tasklet);
|
||||||
snprintf(chan->name, sizeof(chan->name), "chan%d", chan->id);
|
snprintf(chan->name, sizeof(chan->name), "chan%d", chan->id);
|
||||||
|
|
||||||
/* Initialize the channel */
|
/* Initialize the channel */
|
||||||
|
|
Loading…
Reference in New Issue