From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2001:470:1f0b:db:abcd:42:0:1]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 109421A0408 for ; Tue, 14 Jul 2015 06:50:19 +1000 (AEST) Message-Id: <20150713135739.508126995@linutronix.de> Date: Mon, 13 Jul 2015 20:50:09 -0000 From: Thomas Gleixner To: linuxppc-dev@lists.ozlabs.org Cc: Benjamin Herrenschmidt , Michael Ellerman , Russell King , Julia Lawall Subject: [patch 06/20] powerpc/spider-pic: Consolidate chained IRQ handler install/remove References: <20150713135648.540293392@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Signed-off-by: Thomas Gleixner Cc: Julia Lawall Cc: Benjamin Herrenschmidt Cc: Michael Ellerman Cc: linuxppc-dev@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);