From patchwork Mon Jul 13 20:50:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 494741 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 39444140280 for ; Tue, 14 Jul 2015 06:59:31 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 0DACC1A2BCF for ; Tue, 14 Jul 2015 06:59:31 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org 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) Received: from localhost ([127.0.0.1] helo=[127.0.1.1]) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1ZEkg3-0006fX-Uf; Mon, 13 Jul 2015 22:50:16 +0200 Message-Id: <20150713135739.508126995@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:50:09 -0000 From: Thomas Gleixner To: linuxppc-dev@lists.ozlabs.org Subject: [patch 06/20] powerpc/spider-pic: Consolidate chained IRQ handler install/remove References: <20150713135648.540293392@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline; filename=powerpc-spider-pic-Consolidate-chained-IRQ-handler-i.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001, URIBL_BLOCKED=0.001 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julia Lawall , Russell King Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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);