[patch 06/20] powerpc/spider-pic: Consolidate chained IRQ handler install/remove

Thomas Gleixner tglx at linutronix.de
Tue Jul 14 06:50:09 AEST 2015


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/platforms/cell/spider-pic.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: tip/arch/powerpc/platforms/cell/spider-pic.c
===================================================================
--- tip.orig/arch/powerpc/platforms/cell/spider-pic.c
+++ tip/arch/powerpc/platforms/cell/spider-pic.c
@@ -317,8 +317,7 @@ static void __init spider_init_one(struc
 	virq = spider_find_cascade_and_node(pic);
 	if (virq == NO_IRQ)
 		return;
-	irq_set_handler_data(virq, pic);
-	irq_set_chained_handler(virq, spider_irq_cascade);
+	irq_set_chained_handler_and_data(virq, spider_irq_cascade, pic);
 
 	printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n",
 	       pic->node_id, addr, of_node->full_name);




More information about the Linuxppc-dev mailing list