of: merge of_attach_node() & of_detach_node()
Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
@@ -817,65 +817,6 @@ struct device_node *of_find_next_cache_node(struct device_node *np)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Plug a device node into the tree and global list.
|
||||
*/
|
||||
void of_attach_node(struct device_node *np)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
write_lock_irqsave(&devtree_lock, flags);
|
||||
np->sibling = np->parent->child;
|
||||
np->allnext = allnodes;
|
||||
np->parent->child = np;
|
||||
allnodes = np;
|
||||
write_unlock_irqrestore(&devtree_lock, flags);
|
||||
}
|
||||
|
||||
/*
|
||||
* "Unplug" a node from the device tree. The caller must hold
|
||||
* a reference to the node. The memory associated with the node
|
||||
* is not freed until its refcount goes to zero.
|
||||
*/
|
||||
void of_detach_node(struct device_node *np)
|
||||
{
|
||||
struct device_node *parent;
|
||||
unsigned long flags;
|
||||
|
||||
write_lock_irqsave(&devtree_lock, flags);
|
||||
|
||||
parent = np->parent;
|
||||
if (!parent)
|
||||
goto out_unlock;
|
||||
|
||||
if (allnodes == np)
|
||||
allnodes = np->allnext;
|
||||
else {
|
||||
struct device_node *prev;
|
||||
for (prev = allnodes;
|
||||
prev->allnext != np;
|
||||
prev = prev->allnext)
|
||||
;
|
||||
prev->allnext = np->allnext;
|
||||
}
|
||||
|
||||
if (parent->child == np)
|
||||
parent->child = np->sibling;
|
||||
else {
|
||||
struct device_node *prevsib;
|
||||
for (prevsib = np->parent->child;
|
||||
prevsib->sibling != np;
|
||||
prevsib = prevsib->sibling)
|
||||
;
|
||||
prevsib->sibling = np->sibling;
|
||||
}
|
||||
|
||||
of_node_set_flag(np, OF_DETACHED);
|
||||
|
||||
out_unlock:
|
||||
write_unlock_irqrestore(&devtree_lock, flags);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
/*
|
||||
* Fix up the uninitialized fields in a new device node:
|
||||
|
||||
Reference in New Issue
Block a user