diff options
Diffstat (limited to 'arch/sparc/kernel/prom_common.c')
-rw-r--r-- | arch/sparc/kernel/prom_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index d80a65d9e893..5832e13dfeeb 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c | |||
@@ -42,7 +42,7 @@ struct device_node *of_find_node_by_phandle(phandle handle) | |||
42 | struct device_node *np; | 42 | struct device_node *np; |
43 | 43 | ||
44 | for (np = allnodes; np; np = np->allnext) | 44 | for (np = allnodes; np; np = np->allnext) |
45 | if (np->node == handle) | 45 | if (np->phandle == handle) |
46 | break; | 46 | break; |
47 | 47 | ||
48 | return np; | 48 | return np; |
@@ -89,7 +89,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len | |||
89 | void *old_val = prop->value; | 89 | void *old_val = prop->value; |
90 | int ret; | 90 | int ret; |
91 | 91 | ||
92 | ret = prom_setprop(dp->node, name, val, len); | 92 | ret = prom_setprop(dp->phandle, name, val, len); |
93 | 93 | ||
94 | err = -EINVAL; | 94 | err = -EINVAL; |
95 | if (ret >= 0) { | 95 | if (ret >= 0) { |
@@ -236,7 +236,7 @@ static struct device_node * __init prom_create_node(phandle node, | |||
236 | 236 | ||
237 | dp->name = get_one_property(node, "name"); | 237 | dp->name = get_one_property(node, "name"); |
238 | dp->type = get_one_property(node, "device_type"); | 238 | dp->type = get_one_property(node, "device_type"); |
239 | dp->node = node; | 239 | dp->phandle = node; |
240 | 240 | ||
241 | dp->properties = build_prop_list(node); | 241 | dp->properties = build_prop_list(node); |
242 | 242 | ||
@@ -313,7 +313,7 @@ void __init prom_build_devicetree(void) | |||
313 | 313 | ||
314 | nextp = &allnodes->allnext; | 314 | nextp = &allnodes->allnext; |
315 | allnodes->child = prom_build_tree(allnodes, | 315 | allnodes->child = prom_build_tree(allnodes, |
316 | prom_getchild(allnodes->node), | 316 | prom_getchild(allnodes->phandle), |
317 | &nextp); | 317 | &nextp); |
318 | of_console_init(); | 318 | of_console_init(); |
319 | 319 | ||