diff mbox

[09/20] powerpc/mpc7448: Consolidate chained IRQ handler install/remove

Message ID 20150713135739.749350394@linutronix.de (mailing list archive)
State Not Applicable
Headers show

Commit Message

Thomas Gleixner July 13, 2015, 8:50 p.m. UTC 
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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
---
 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

Index: tip/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
===================================================================
--- tip.orig/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ tip/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -134,8 +134,8 @@  static void __init mpc7448_hpc2_init_IRQ
 	DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
 	    (u32) cascade_pci_irq);
 	tsi108_pci_int_init(cascade_node);
-	irq_set_handler_data(cascade_pci_irq, mpic);
-	irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+	irq_set_chained_handler_and_data(cascade_pci_irq, tsi108_irq_cascade,
+					 mpic);
 #endif
 	/* Configure MPIC outputs to CPU0 */
 	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);