ARM/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.

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: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 5168a52a17f97637e68d64596f8ffa75f051e2d6..4a347dee75ff6345bb5c4ee7ab9fa03a7ec2de88 100644 (file)
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -582,8 +582,9 @@ void __init orion_gpio_init(struct device_node *np,
 
        for (i = 0; i < 4; i++) {
                if (irqs[i]) {
-                       irq_set_handler_data(irqs[i], ochip);
-                       irq_set_chained_handler(irqs[i], gpio_irq_handler);
+                       irq_set_chained_handler_and_data(irqs[i],
+                                                        gpio_irq_handler,
+                                                        ochip);
                }
        }