renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-02 10:43:57 +08:00
Code

of: add __of_add_property() without lock operations

Browse Source 
There two places will use the same code for adding one new property to
the DT node. Adding __of_add_property() and prepare for fixing
of_update_property()'s bug.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Xiubo Li 2014-01-22 13:57:39 +08:00 committed by Grant Likely
parent e3963fd60a
commit 62664f6777
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/of/base.c
View File

@ -1492,12 +1492,32 @@ static int of_property_notify(int action, struct device_node *np,
} }
#endif #endif
/**
* __of_add_property - Add a property to a node without lock operations
*/
static int __of_add_property(struct device_node *np, struct property *prop)
{
struct property **next;
prop->next = NULL;
next = &np->properties;
while (*next) {
if (strcmp(prop->name, (*next)->name) == 0)
/* duplicate ! don't insert it */
return -EEXIST;
next = &(*next)->next;
}
*next = prop;
return 0;
}
/** /**
* of_add_property - Add a property to a node * of_add_property - Add a property to a node
*/ */
int of_add_property(struct device_node *np, struct property *prop) int of_add_property(struct device_node *np, struct property *prop)
{ {
struct property **next;
unsigned long flags; unsigned long flags;
int rc; int rc;
@ -1505,27 +1525,17 @@ int of_add_property(struct device_node *np, struct property *prop)
if (rc) if (rc)
return rc; return rc;
prop->next = NULL;
raw_spin_lock_irqsave(&devtree_lock, flags); raw_spin_lock_irqsave(&devtree_lock, flags);
next = &np->properties; rc = __of_add_property(np, prop);
while (*next) {
if (strcmp(prop->name, (*next)->name) == 0) {
/* duplicate ! don't insert it */
raw_spin_unlock_irqrestore(&devtree_lock, flags);
return -1;
}
next = &(*next)->next;
}
*next = prop;
raw_spin_unlock_irqrestore(&devtree_lock, flags); raw_spin_unlock_irqrestore(&devtree_lock, flags);
#ifdef CONFIG_PROC_DEVICETREE #ifdef CONFIG_PROC_DEVICETREE
/* try to add to proc as well if it was initialized */ /* try to add to proc as well if it was initialized */
if (np->pde) if (!rc && np->pde)
proc_device_tree_add_prop(np->pde, prop); proc_device_tree_add_prop(np->pde, prop);
#endif /* CONFIG_PROC_DEVICETREE */ #endif /* CONFIG_PROC_DEVICETREE */
return 0; return rc;
} }
/** /**