|
@@ -80,10 +80,7 @@ struct boot_param_header *initial_boot_params;
|
|
|
|
|
|
static struct device_node *allnodes = NULL;
|
|
|
|
|
|
-/* use when traversing tree through the allnext, child, sibling,
|
|
|
- * or parent members of struct device_node.
|
|
|
- */
|
|
|
-static DEFINE_RWLOCK(devtree_lock);
|
|
|
+extern rwlock_t devtree_lock; /* temporary while merging */
|
|
|
|
|
|
/* export that to outside world */
|
|
|
struct device_node *of_chosen;
|
|
@@ -1489,25 +1486,6 @@ static int __init prom_reconfig_setup(void)
|
|
|
__initcall(prom_reconfig_setup);
|
|
|
#endif
|
|
|
|
|
|
-struct property *of_find_property(const struct device_node *np,
|
|
|
- const char *name,
|
|
|
- int *lenp)
|
|
|
-{
|
|
|
- struct property *pp;
|
|
|
-
|
|
|
- read_lock(&devtree_lock);
|
|
|
- for (pp = np->properties; pp != 0; pp = pp->next)
|
|
|
- if (strcmp(pp->name, name) == 0) {
|
|
|
- if (lenp != 0)
|
|
|
- *lenp = pp->length;
|
|
|
- break;
|
|
|
- }
|
|
|
- read_unlock(&devtree_lock);
|
|
|
-
|
|
|
- return pp;
|
|
|
-}
|
|
|
-EXPORT_SYMBOL(of_find_property);
|
|
|
-
|
|
|
/*
|
|
|
* Add a property to a node
|
|
|
*/
|