From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754290AbcFGINv (ORCPT ); Tue, 7 Jun 2016 04:13:51 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:30120 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbcFGIIo (ORCPT ); Tue, 7 Jun 2016 04:08:44 -0400 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , Ganapatrao Kulkarni , Robert Richter , "David Daney" , Rob Herring , "Frank Rowand" , Grant Likely , devicetree , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , "Kefeng Wang" Subject: [PATCH v4 06/14] of_numa: Use of_get_next_parent to simplify code Date: Tue, 7 Jun 2016 16:08:10 +0800 Message-ID: <1465286898-13828-7-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com> References: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.57568108.0041,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 255b02cf1f0a7a1354ce6f19e696b0f6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kefeng Wang Use of_get_next_parent() instead of open-code. Signed-off-by: Kefeng Wang --- drivers/of/of_numa.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 3157130..ed7bd22 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -153,8 +153,6 @@ int of_node_to_nid(struct device_node *device) np = of_node_get(device); while (np) { - struct device_node *parent; - r = of_property_read_u32(np, "numa-node-id", &nid); /* * -EINVAL indicates the property was not found, and @@ -165,9 +163,7 @@ int of_node_to_nid(struct device_node *device) if (r != -EINVAL) break; - parent = of_get_parent(np); - of_node_put(np); - np = parent; + np = of_get_next_parent(np); } if (np && r) pr_warn("NUMA: Invalid \"numa-node-id\" property in node %s\n", -- 2.5.0