irqchip/vic: 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-vic.c b/drivers/irqchip/irq-vic.c
index 4cd65c19c1eeb9c2872fc9e429545b5f93faeeee..03846dff42123c96079489f998ed18e7623ff576 100644 (file)
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -296,8 +296,8 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq,
        vic_id++;
 
        if (parent_irq) {
-               irq_set_handler_data(parent_irq, v);
-               irq_set_chained_handler(parent_irq, vic_handle_irq_cascaded);
+               irq_set_chained_handler_and_data(parent_irq,
+                                                vic_handle_irq_cascaded, v);
        }
 
        v->domain = irq_domain_add_simple(node, fls(valid_sources), irq,