From 837dae1b4308f2dfc9c5bc76c367553670198c63 Mon Sep 17 00:00:00 2001 From: Kefeng Wang Date: Thu, 1 Sep 2016 14:54:57 +0800 Subject: of_numa: Use of_get_next_parent to simplify code Use of_get_next_parent() instead of open-code. Signed-off-by: Kefeng Wang Acked-by: Rob Herring Signed-off-by: Will Deacon --- 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 625b0573e5f8..0d7459bd31f0 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -158,8 +158,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 @@ -170,9 +168,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", -- cgit v1.2.3