irqchip/orion: 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-orion.c b/drivers/irqchip/irq-orion.c
index 995f66b8616e21172349292384212679371b7beb..7fbae56b802ca155cc4e9060625826756ce6faa9 100644 (file)
--- a/drivers/irqchip/irq-orion.c
+++ b/drivers/irqchip/irq-orion.c
@@ -197,8 +197,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,
        writel(0, gc->reg_base + ORION_BRIDGE_IRQ_MASK);
        writel(0, gc->reg_base + ORION_BRIDGE_IRQ_CAUSE);
 
-       irq_set_handler_data(irq, domain);
-       irq_set_chained_handler(irq, orion_bridge_irq_handler);
+       irq_set_chained_handler_and_data(irq, orion_bridge_irq_handler,
+                                        domain);
 
        return 0;
 }