irqchip/imgpdc: Consolidate chained IRQ handler install/remove

Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.

Search and conversion was done with coccinelle:

@@
expression E1, E2, E3;
@@
(
-if (irq_set_handler_data(E1, E2) != 0)
-   BUG();
|
-irq_set_handler_data(E1, E2);
)
-irq_set_chained_handler(E1, E3);
+irq_set_chained_handler_and_data(E1, E3, E2);

@@
expression E1, E2, E3;
@@
(
-if (irq_set_handler_data(E1, E2) != 0)
-   BUG();
...
|
-irq_set_handler_data(E1, E2);
...
)
-irq_set_chained_handler(E1, E3);
+irq_set_chained_handler_and_data(E1, E3, E2);

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>

diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c
index 8071c2eb02487f2f6a681f0ad2b62df01b418d58..03d91cbfc45ea62d08004556ac91ed1a4a97adb0 100644 (file)
--- a/drivers/irqchip/irq-imgpdc.c
+++ b/drivers/irqchip/irq-imgpdc.c
@@ -451,13 +451,13 @@ static int pdc_intc_probe(struct platform_device *pdev)
        /* Setup chained handlers for the peripheral IRQs */
        for (i = 0; i < priv->nr_perips; ++i) {
                irq = priv->perip_irqs[i];
-               irq_set_handler_data(irq, priv);
-               irq_set_chained_handler(irq, pdc_intc_perip_isr);
+               irq_set_chained_handler_and_data(irq, pdc_intc_perip_isr,
+                                                priv);
        }
 
        /* Setup chained handler for the syswake IRQ */
-       irq_set_handler_data(priv->syswake_irq, priv);
-       irq_set_chained_handler(priv->syswake_irq, pdc_intc_syswake_isr);
+       irq_set_chained_handler_and_data(priv->syswake_irq,
+                                        pdc_intc_syswake_isr, priv);
 
        dev_info(&pdev->dev,
                 "PDC IRQ controller initialised (%u perip IRQs, %u syswake IRQs)\n",