irqchip/brcmstb-l2: Consolidate chained IRQ handler install/remove
authorThomas Gleixner <tglx@linutronix.de>
Sun, 21 Jun 2015 19:10:52 +0000 (21:10 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 11 Jul 2015 21:14:25 +0000 (23:14 +0200)
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: Kevin Cernekee <cernekee@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: linux-mips@linux-mips.org
drivers/irqchip/irq-brcmstb-l2.c

index 4e60b88ec33fb1c7a1dcf24a138b8f9681d2c63d..cef15189aa5bef583de8aa8b1b2a213292270c83 100644 (file)
@@ -170,8 +170,8 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
        }
 
        /* Set the IRQ chaining logic */
-       irq_set_handler_data(data->parent_irq, data);
-       irq_set_chained_handler(data->parent_irq, brcmstb_l2_intc_irq_handle);
+       irq_set_chained_handler_and_data(data->parent_irq,
+                                        brcmstb_l2_intc_irq_handle, data);
 
        gc = irq_get_domain_generic_chip(data->domain, 0);
        gc->reg_base = data->base;