Commit 837dae1b authored by Kefeng Wang's avatar Kefeng Wang Committed by Will Deacon

of_numa: Use of_get_next_parent to simplify code

Use of_get_next_parent() instead of open-code.
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 794224ea
...@@ -158,8 +158,6 @@ int of_node_to_nid(struct device_node *device) ...@@ -158,8 +158,6 @@ int of_node_to_nid(struct device_node *device)
np = of_node_get(device); np = of_node_get(device);
while (np) { while (np) {
struct device_node *parent;
r = of_property_read_u32(np, "numa-node-id", &nid); r = of_property_read_u32(np, "numa-node-id", &nid);
/* /*
* -EINVAL indicates the property was not found, and * -EINVAL indicates the property was not found, and
...@@ -170,9 +168,7 @@ int of_node_to_nid(struct device_node *device) ...@@ -170,9 +168,7 @@ int of_node_to_nid(struct device_node *device)
if (r != -EINVAL) if (r != -EINVAL)
break; break;
parent = of_get_parent(np); np = of_get_next_parent(np);
of_node_put(np);
np = parent;
} }
if (np && r) if (np && r)
pr_warn("NUMA: Invalid \"numa-node-id\" property in node %s\n", pr_warn("NUMA: Invalid \"numa-node-id\" property in node %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment