Merge tag 'for-5.11/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index a2cf25c..7eaee5b 100644 (file)
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -598,9 +598,9 @@ static void atc_handle_cyclic(struct at_dma_chan *atchan)
 
 /*--  IRQ & Tasklet  ---------------------------------------------------*/
 
-static void atc_tasklet(unsigned long data)
+static void atc_tasklet(struct tasklet_struct *t)
 {
-       struct at_dma_chan *atchan = (struct at_dma_chan *)data;
+       struct at_dma_chan *atchan = from_tasklet(atchan, t, tasklet);
 
        if (test_and_clear_bit(ATC_IS_ERROR, &atchan->status))
                return atc_handle_error(atchan);
@@ -1892,8 +1892,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&atchan->queue);
                INIT_LIST_HEAD(&atchan->free_list);
 
-               tasklet_init(&atchan->tasklet, atc_tasklet,
-                               (unsigned long)atchan);
+               tasklet_setup(&atchan->tasklet, atc_tasklet);
                atc_enable_chan_irq(atdma, i);
        }