From patchwork Fri Nov 20 20:33:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 547044 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49F791402B0 for ; Sat, 21 Nov 2015 07:59:42 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 2F86F1A0E2E for ; Sat, 21 Nov 2015 07:59:42 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) (using TLSv1.2 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 1502B1A0143 for ; Sat, 21 Nov 2015 07:56:21 +1100 (AEDT) X-IronPort-AV: E=Sophos;i="5.20,324,1444687200"; d="scan'208";a="188467061" Received: from palace.rsr.lip6.fr (HELO localhost.localdomain) ([132.227.105.202]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/AES128-SHA256; 20 Nov 2015 21:45:14 +0100 From: Julia Lawall To: Benjamin Herrenschmidt Subject: [PATCH 2/6] powerpc/pseries: add missing of_node_put Date: Fri, 20 Nov 2015 21:33:20 +0100 Message-Id: <1448051604-25256-3-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448051604-25256-1-git-send-email-Julia.Lawall@lip6.fr> References: <1448051604-25256-1-git-send-email-Julia.Lawall@lip6.fr> 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: Thomas Petazzoni , Andrew Lunn , Russell King - ARM Linux , Jason Cooper , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Mackerras , Bjorn Helgaas , linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" for_each_node_by_type performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. In this code, there are two paths that break out of the loop. In the first one (open-pic case), the code originally contained an of_node_get. That increments the reference count, which cancels out against the decrement of the reference count that is needed here, and thus the patch drops the of_node_get. In the second one (ppc-xicp case), there is no need to save the node value, and so an of_node_put is added as described by the following semantic patch rule (http://coccinelle.lip6.fr): // @@ expression e,e1; local idexpression n; @@ for_each_node_by_type(n, e1) { ... when != of_node_put(n) when != e = n ( return n; | + of_node_put(n); ? return ...; ) ... } // Signed-off-by: Julia Lawall --- arch/powerpc/platforms/pseries/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 36df46e..7185cd3 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -236,7 +236,7 @@ static void __init pseries_discover_pic(void) for_each_node_by_name(np, "interrupt-controller") { typep = of_get_property(np, "compatible", NULL); if (strstr(typep, "open-pic")) { - pSeries_mpic_node = of_node_get(np); + pSeries_mpic_node = np; ppc_md.init_IRQ = pseries_mpic_init_IRQ; setup_kexec_cpu_down_mpic(); smp_init_pseries_mpic(); @@ -245,6 +245,7 @@ static void __init pseries_discover_pic(void) ppc_md.init_IRQ = pseries_xics_init_IRQ; setup_kexec_cpu_down_xics(); smp_init_pseries_xics(); + of_node_put(np); return; } }