Merge existing fixes from asoc/for-5.10

[linux-2.6-microblaze.git] / drivers / mailbox / bcm-pdc-mailbox.c

diff --git a/drivers/mailbox/bcm-pdc-mailbox.c b/drivers/mailbox/bcm-pdc-mailbox.c
index 53945ca..5b37598 100644 (file)
--- a/drivers/mailbox/bcm-pdc-mailbox.c
+++ b/drivers/mailbox/bcm-pdc-mailbox.c
@@ -962,9 +962,9 @@ static irqreturn_t pdc_irq_handler(int irq, void *data)
  * a DMA receive interrupt. Reenables the receive interrupt.
  * @data: PDC state structure
  */
-static void pdc_tasklet_cb(unsigned long data)
+static void pdc_tasklet_cb(struct tasklet_struct *t)
 {
-       struct pdc_state *pdcs = (struct pdc_state *)data;
+       struct pdc_state *pdcs = from_tasklet(pdcs, t, rx_tasklet);
 
        pdc_receive(pdcs);
 
@@ -1589,7 +1589,7 @@ static int pdc_probe(struct platform_device *pdev)
        pdc_hw_init(pdcs);
 
        /* Init tasklet for deferred DMA rx processing */
-       tasklet_init(&pdcs->rx_tasklet, pdc_tasklet_cb, (unsigned long)pdcs);
+       tasklet_setup(&pdcs->rx_tasklet, pdc_tasklet_cb);
 
        err = pdc_interrupts_init(pdcs);
        if (err)