From patchwork Thu Jun 4 09:34:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 480581 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 951151401B5 for ; Thu, 4 Jun 2015 19:47:22 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 7844D1A2ACA for ; Thu, 4 Jun 2015 19:47:22 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 688 seconds by postgrey-1.35 at bilbo; Thu, 04 Jun 2015 19:46:21 AEST Received: from winston.telenet-ops.be (winston.telenet-ops.be [195.130.137.75]) by lists.ozlabs.org (Postfix) with ESMTP id 8B4981A1DFE for ; Thu, 4 Jun 2015 19:46:21 +1000 (AEST) Received: from michel.telenet-ops.be (michel.telenet-ops.be [195.130.137.88]) by winston.telenet-ops.be (Postfix) with ESMTP id 1E1671BF501 for ; Thu, 4 Jun 2015 11:34:43 +0200 (CEST) Received: from ayla.of.borg ([84.193.93.87]) by michel.telenet-ops.be with bizsmtp id c9af1q00Y1t5w8s069afoG; Thu, 04 Jun 2015 11:34:42 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1Z0RXq-0004D3-Vd; Thu, 04 Jun 2015 11:34:39 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1Z0RXy-0005tT-Vm; Thu, 04 Jun 2015 11:34:46 +0200 From: Geert Uytterhoeven To: Grant Likely , Rob Herring , Paul Mackerras , Benjamin Herrenschmidt , Michael Ellerman Subject: [PATCH] of/dynamic: Fix test for PPC_PSERIES Date: Thu, 4 Jun 2015 11:34:41 +0200 Message-Id: <1433410481-22611-1-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 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: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" "IS_ENABLED(PPC_PSERIES)" always evaluates to false, as IS_ENABLED() is supposed to be used with the full Kconfig symbol name, including the "CONFIG_" prefix. Add the missing "CONFIG_" prefix to fix this. Fixes: a25095d451ece23b ("of: Move dynamic node fixups out of powerpc and into common code") Signed-off-by: Geert Uytterhoeven --- Did this bug cause any breakage? If yes, the fix should go to stable (for v3.17 and later). --- drivers/of/dynamic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index dee658de72b3b221..1901f8870591fe30 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -226,7 +226,7 @@ void __of_attach_node(struct device_node *np) phandle = __of_get_property(np, "phandle", &sz); if (!phandle) phandle = __of_get_property(np, "linux,phandle", &sz); - if (IS_ENABLED(PPC_PSERIES) && !phandle) + if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle) phandle = __of_get_property(np, "ibm,phandle", &sz); np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0;