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 <Li.Xiubo@freescale.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 62664f67775fad840cf6f68d6b5f428817bef6c5)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
	drivers/of/base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 33d7c80316b8f3b43997ecf36299539d9444343a..cdb09ab8ae3dfd3ce7ab0f9f705e4008a174ebad 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1421,38 +1421,45 @@ int of_count_phandle_with_args(const struct device_node *np, const char *list_na
 EXPORT_SYMBOL(of_count_phandle_with_args);
 
 /**
- * of_add_property - Add a property to a node
+ * __of_add_property - Add a property to a node without lock operations
  */
-int of_add_property(struct device_node *np, struct property *prop)
+static int __of_add_property(struct device_node *np, struct property *prop)
 {
        struct property **next;
-       unsigned long flags;
-       int rc;
-
-       rc = of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, 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) {
+               if (strcmp(prop->name, (*next)->name) == 0)
                        /* duplicate ! don't insert it */
-                       raw_spin_unlock_irqrestore(&devtree_lock, flags);
-                       return -1;
-               }
+                       return -EEXIST;
+
                next = &(*next)->next;
        }
        *next = prop;
-       raw_spin_unlock_irqrestore(&devtree_lock, flags);
+
+       return 0;
+}
+
+/**
+ * of_add_property - Add a property to a node
+ */
+int of_add_property(struct device_node *np, struct property *prop)
+{
+       unsigned long flags;
+       int rc;
+
+       rc = of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop);
        if (rc)
                return rc;
 
-       if (of_node_is_attached(np))
+       raw_spin_lock_irqsave(&devtree_lock, flags);
+       rc = __of_add_property(np, prop);
+       raw_spin_unlock_irqrestore(&devtree_lock, flags);
+       if (!rc)
                __of_add_property_sysfs(np, prop);
 
-       return 0;
+       return rc;
 }
 
 /**