From: Xiubo Li
Date: Wed, 22 Jan 2014 05:57:39 +0000 (+0800)
Subject: of: add __of_add_property() without lock operations
X-Git-Tag: v3.15-rc1~121^2~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62664f67775fad840cf6f68d6b5f428817bef6c5;p=~emulex%2Finfiniband.git
of: add __of_add_property() without lock operations
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
Signed-off-by: Grant Likely
---
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 87038d80b47..6ad3dc976b1 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1492,12 +1492,32 @@ static int of_property_notify(int action, struct device_node *np,
}
#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
*/
int of_add_property(struct device_node *np, struct property *prop)
{
- struct property **next;
unsigned long flags;
int rc;
@@ -1505,27 +1525,17 @@ int of_add_property(struct device_node *np, struct property *prop)
if (rc)
return rc;
- prop->next = NULL;
raw_spin_lock_irqsave(&devtree_lock, flags);
- next = &np->properties;
- 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;
+ rc = __of_add_property(np, prop);
raw_spin_unlock_irqrestore(&devtree_lock, flags);
#ifdef CONFIG_PROC_DEVICETREE
/* 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);
#endif /* CONFIG_PROC_DEVICETREE */
- return 0;
+ return rc;
}
/**