Commit 4aef8c53 authored by David S. Miller's avatar David S. Miller

sparc: Match sparc32's build_tree() up to sparc64's

Sparc64 uses a non-recursive sibling traversal algorithm
that never got propagated into the sparc32 copy of this
code.

Sync them up.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d9439d5
...@@ -198,23 +198,33 @@ static char * __init build_full_name(struct device_node *dp) ...@@ -198,23 +198,33 @@ static char * __init build_full_name(struct device_node *dp)
static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp) static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)
{ {
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp; struct device_node *dp;
while (1) {
dp = create_node(node, parent); dp = create_node(node, parent);
if (dp) { if (!dp)
break;
if (prev_sibling)
prev_sibling->sibling = dp;
if (!ret)
ret = dp;
prev_sibling = dp;
*(*nextp) = dp; *(*nextp) = dp;
*nextp = &dp->allnext; *nextp = &dp->allnext;
dp->parent = parent;
dp->path_component_name = build_path_component(dp); dp->path_component_name = build_path_component(dp);
dp->full_name = build_full_name(dp); dp->full_name = build_full_name(dp);
dp->child = build_tree(dp, prom_getchild(node), nextp); dp->child = build_tree(dp, prom_getchild(node), nextp);
dp->sibling = build_tree(parent, prom_getsibling(node), nextp); node = prom_getsibling(node);
} }
return dp; return ret;
} }
struct device_node *of_console_device; struct device_node *of_console_device;
......
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