diff mbox

[03/20] powerpc/pq2ads: Consolidate chained IRQ handler install/remove

Message ID 20150713135739.247799155@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/82xx/pq2ads-pci-pic.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox

Patch

Index: tip/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
===================================================================
--- tip.orig/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ tip/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -162,8 +162,7 @@  int __init pq2ads_pci_init_irq(void)
 	}
 
 	priv->host = host;
-	irq_set_handler_data(irq, priv);
-	irq_set_chained_handler(irq, pq2ads_pci_irq_demux);
+	irq_set_chained_handler_and_data(irq, pq2ads_pci_irq_demux, priv);
 
 	of_node_put(np);
 	return 0;