[PATCH v7 06/14] of_numa: Use of_get_next_parent to simplify code

[Zhen Lei]

From: Kefeng Wang 

Use of_get_next_parent() instead of open-code.

Signed-off-by: Kefeng Wang 
Acked-by: Rob Herring 
---
 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 8723f64..ed103e6 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", );
/*
 * -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",
--
2.5.0

[PATCH v7 06/14] of_numa: Use of_get_next_parent to simplify code

[Zhen Lei]

From: Kefeng Wang 

Use of_get_next_parent() instead of open-code.

Signed-off-by: Kefeng Wang 
Acked-by: Rob Herring 
---
 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 8723f64..ed103e6 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", );
/*
 * -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",
--
2.5.0