Merge branch 'for-5.15/logitech' into for-linus

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

diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 87a2460..0102777 100644 (file)
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -745,9 +745,9 @@ static void ep93xx_dma_advance_work(struct ep93xx_dma_chan *edmac)
        spin_unlock_irqrestore(&edmac->lock, flags);
 }
 
-static void ep93xx_dma_tasklet(unsigned long data)
+static void ep93xx_dma_tasklet(struct tasklet_struct *t)
 {
-       struct ep93xx_dma_chan *edmac = (struct ep93xx_dma_chan *)data;
+       struct ep93xx_dma_chan *edmac = from_tasklet(edmac, t, tasklet);
        struct ep93xx_dma_desc *desc, *d;
        struct dmaengine_desc_callback cb;
        LIST_HEAD(list);
@@ -1353,8 +1353,7 @@ static int __init ep93xx_dma_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&edmac->active);
                INIT_LIST_HEAD(&edmac->queue);
                INIT_LIST_HEAD(&edmac->free_list);
-               tasklet_init(&edmac->tasklet, ep93xx_dma_tasklet,
-                            (unsigned long)edmac);
+               tasklet_setup(&edmac->tasklet, ep93xx_dma_tasklet);
 
                list_add_tail(&edmac->chan.device_node,
                              &dma_dev->channels);