Skip to content

Commit

Permalink
of_numa: Use of_get_next_parent to simplify code
Browse files Browse the repository at this point in the history
Use of_get_next_parent() instead of open-code.

Signed-off-by: Kefeng Wang <[email protected]>
Acked-by: Rob Herring <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
  • Loading branch information
Kefeng Wang authored and wildea01 committed Sep 9, 2016
1 parent 794224e commit 837dae1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/of/of_numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
Expand Down

0 comments on commit 837dae1

Please sign in to comment.