Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966078AbcJYVAl (ORCPT ); Tue, 25 Oct 2016 17:00:41 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35564 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755827AbcJYVAN (ORCPT ); Tue, 25 Oct 2016 17:00:13 -0400 From: frowand.list@gmail.com To: Rob Herring , pantelis.antoniou@konsulko.com, Pantelis Antoniou Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 12/13] of: Move setting of pointer to beside test for non-null Date: Tue, 25 Oct 2016 13:59:05 -0700 Message-Id: <1477429146-27039-13-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477429146-27039-1-git-send-email-frowand.list@gmail.com> References: <1477429146-27039-1-git-send-email-frowand.list@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 894 Lines: 30 From: Frank Rowand Signed-off-by: Frank Rowand --- drivers/of/resolver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 664c97e1ecb4..3f7cf569c7ea 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -305,8 +305,6 @@ int of_resolve_phandles(struct device_node *overlay) overlay_symbols = NULL; overlay_fixups = NULL; - tree_symbols = of_find_node_by_path("/__symbols__"); - for_each_child_of_node(overlay, child) { if (!of_node_cmp(child->name, "__symbols__")) overlay_symbols = child; @@ -319,6 +317,7 @@ int of_resolve_phandles(struct device_node *overlay) goto out; } + tree_symbols = of_find_node_by_path("/__symbols__"); if (!tree_symbols) { pr_err("no symbols in root of device tree.\n"); err = -EINVAL; -- 1.9.1