[patch 10/20] powerpc/mpic: Consolidate chained IRQ handler install/remove

[Thomas Gleixner]

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 at arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: Julia Lawall <Julia.Lawall at lip6.fr>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Michael Ellerman <mpe at ellerman.id.au>
Cc: linuxppc-dev at lists.ozlabs.org
---
 arch/powerpc/sysdev/mpic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: tip/arch/powerpc/sysdev/mpic.c
===================================================================
--- tip.orig/arch/powerpc/sysdev/mpic.c
+++ tip/arch/powerpc/sysdev/mpic.c
@@ -1665,8 +1665,8 @@ void __init mpic_init(struct mpic *mpic)
 		if (virq != NO_IRQ) {
 			printk(KERN_INFO "%s: hooking up to IRQ %d\n",
 					mpic->node->full_name, virq);
-			irq_set_handler_data(virq, mpic);
-			irq_set_chained_handler(virq, &mpic_cascade);
+			irq_set_chained_handler_and_data(virq, &mpic_cascade,
+						         mpic);
 		}
 	}