MIPS/ath25: Fix race in installing chained IRQ handler

Fix a race where a pending interrupt could be received and the handler
called before the handler's data has been setup, by converting to
irq_set_chained_handler_and_data().

Search and conversion was done with coccinelle:

@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
-   BUG();
|
-irq_set_chained_handler(E1, E3);
)
-irq_set_handler_data(E1, E2);
+irq_set_chained_handler_and_data(E1, E3, E2);

@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
-   BUG();
...
|
-irq_set_chained_handler(E1, E3);
...
)
-irq_set_handler_data(E1, E2);
+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: Ralf Baechle <ralf@linux-mips.org>
Cc: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: linux-mips@linux-mips.org

diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c
index 2befa7d766a61c25c0549b30c26cf7584ab86b54..35f96f7a0a3c99aff3f5c3ed3ea588c9ae67bfa1 100644 (file)
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
@@ -161,8 +161,8 @@ void __init ar2315_arch_init_irq(void)
        irq = irq_create_mapping(domain, AR2315_MISC_IRQ_AHB);
        setup_irq(irq, &ar2315_ahb_err_interrupt);
 
-       irq_set_chained_handler(AR2315_IRQ_MISC, ar2315_misc_irq_handler);
-       irq_set_handler_data(AR2315_IRQ_MISC, domain);
+       irq_set_chained_handler_and_data(AR2315_IRQ_MISC,
+                                        ar2315_misc_irq_handler, domain);
 
        ar2315_misc_irq_domain = domain;
 }