Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index e342cf5..0feb323 100644 (file)
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -976,9 +976,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
        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");
 
@@ -1151,7 +1151,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
        }
 
        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);
 
        /* Initialize the channel */