[patch 11/20] powerpc/qe_ic: 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/qe_lib/qe_ic.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: tip/arch/powerpc/sysdev/qe_lib/qe_ic.c
===================================================================
--- tip.orig/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ tip/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -368,13 +368,12 @@ void __init qe_ic_init(struct device_nod
 
 	qe_ic_write(qe_ic->regs, QEIC_CICR, temp);
 
-	irq_set_handler_data(qe_ic->virq_low, qe_ic);
-	irq_set_chained_handler(qe_ic->virq_low, low_handler);
+	irq_set_chained_handler_and_data(qe_ic->virq_low, low_handler, qe_ic);
 
 	if (qe_ic->virq_high != NO_IRQ &&
 			qe_ic->virq_high != qe_ic->virq_low) {
-		irq_set_handler_data(qe_ic->virq_high, qe_ic);
-		irq_set_chained_handler(qe_ic->virq_high, high_handler);
+		irq_set_chained_handler_and_data(qe_ic->virq_high,
+						 high_handler, qe_ic);
 	}
 }