sparc: Match sparc32's build_tree() up to sparc64's
authorDavid S. Miller <davem@davemloft.net>
Fri, 5 Dec 2008 09:12:32 +0000 (01:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 01:09:49 +0000 (17:09 -0800)
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: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/prom_32.c

index 5881c14381984610bd016ffd2c91fa5ba8f04965..35cb4c74252427c82cf734cf7af9344e4bddd774 100644 (file)
@@ -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)
 {
+       struct device_node *ret = NULL, *prev_sibling = NULL;
        struct device_node *dp;
 
-       dp = create_node(node, parent);
-       if (dp) {
+       while (1) {
+               dp = create_node(node, parent);
+               if (!dp)
+                       break;
+
+               if (prev_sibling)
+                       prev_sibling->sibling = dp;
+
+               if (!ret)
+                       ret = dp;
+               prev_sibling = dp;
+
                *(*nextp) = dp;
                *nextp = &dp->allnext;
 
-               dp->parent = parent;
                dp->path_component_name = build_path_component(dp);
                dp->full_name = build_full_name(dp);
 
                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;