Merge tag 'hyperv-next-signed-20210426' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / dma / nbpfaxi.c

diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
index ca4e093..9c52c57 100644 (file)
--- a/drivers/dma/nbpfaxi.c
+++ b/drivers/dma/nbpfaxi.c
@@ -1113,9 +1113,9 @@ static struct dma_chan *nbpf_of_xlate(struct of_phandle_args *dma_spec,
        return dchan;
 }
 
-static void nbpf_chan_tasklet(unsigned long data)
+static void nbpf_chan_tasklet(struct tasklet_struct *t)
 {
-       struct nbpf_channel *chan = (struct nbpf_channel *)data;
+       struct nbpf_channel *chan = from_tasklet(chan, t, tasklet);
        struct nbpf_desc *desc, *tmp;
        struct dmaengine_desc_callback cb;
 
@@ -1260,7 +1260,7 @@ static int nbpf_chan_probe(struct nbpf_device *nbpf, int n)
 
        snprintf(chan->name, sizeof(chan->name), "nbpf %d", n);
 
-       tasklet_init(&chan->tasklet, nbpf_chan_tasklet, (unsigned long)chan);
+       tasklet_setup(&chan->tasklet, nbpf_chan_tasklet);
        ret = devm_request_irq(dma_dev->dev, chan->irq,
                        nbpf_chan_irq, IRQF_SHARED,
                        chan->name, chan);