diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-10-01 06:48:59 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-10-01 06:48:59 +0200 |
| commit | a841592fb3a70bc3f3c2eaa2c1781479a52f76f9 (patch) | |
| tree | 9b18939a0d411779e0640e862ac2d1b353b23cb7 /drivers/dma/fsl_raid.c | |
| parent | dmaengine: dmatest: Return boolean result directly in filter() (diff) | |
| parent | dmaengine: pl330: fix argument for tasklet (diff) | |
| download | linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.tar.xz linux-a841592fb3a70bc3f3c2eaa2c1781479a52f76f9.zip | |
Merge branch 'topic/tasklet' into next
Diffstat (limited to 'drivers/dma/fsl_raid.c')
| -rw-r--r-- | drivers/dma/fsl_raid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c index 493dc6c59d1d..1ddd7cee2e7a 100644 --- a/drivers/dma/fsl_raid.c +++ b/drivers/dma/fsl_raid.c @@ -154,9 +154,9 @@ static void fsl_re_cleanup_descs(struct fsl_re_chan *re_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_hw_desc *hwdesc; 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); 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); if (ret) { |