irqchip/tb10x: Consolidate chained IRQ handler install/remove
authorThomas Gleixner <tglx@linutronix.de>
Sun, 21 Jun 2015 19:10:58 +0000 (21:10 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 11 Jul 2015 21:14:26 +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: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
drivers/irqchip/irq-tb10x.c

index 55dea554d9553591dd913f13854dc8a9f722baf5..c7e1407c2b4062aab88edd7d94b09460b2669e96 100644 (file)
@@ -173,8 +173,8 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
        for (i = 0; i < nrirqs; i++) {
                unsigned int irq = irq_of_parse_and_map(ictl, i);
 
-               irq_set_handler_data(irq, domain);
-               irq_set_chained_handler(irq, tb10x_irq_cascade);
+               irq_set_chained_handler_and_data(irq, tb10x_irq_cascade,
+                                                domain);
        }
 
        ab_irqctl_writereg(gc, AB_IRQCTL_INT_ENABLE, 0);