3 files changed, 96 insertions, 66 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 0d8955605738..b403f9d98461 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1659,7 +1659,7 @@ EXPORT_SYMBOL(of_count_phandle_with_args);
 /**
  * __of_add_property - Add a property to a node without lock operations
  */
-static 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;
 
@@ -1701,6 +1701,25 @@ int of_add_property(struct device_node *np, struct property *prop)
         return rc;
 }
 
+int __of_remove_property(struct device_node *np, struct property *prop)
+{
+        struct property **next;
+
+        for (next = &np->properties; *next; next = &(*next)->next) {
+                if (*next == prop)
+                        break;
+        }
+        if (*next == NULL)
+                return -ENODEV;
+
+        /* found the node */
+        *next = prop->next;
+        prop->next = np->deadprops;
+        np->deadprops = prop;
+
+        return 0;
+}
+
 /**
  * of_remove_property - Remove a property from a node.
  *
@@ -1711,9 +1730,7 @@ int of_add_property(struct device_node *np, struct property *prop)
  */
 int of_remove_property(struct device_node *np, struct property *prop)
 {
-        struct property **next;
         unsigned long flags;
-        int found = 0;
         int rc;
 
         rc = of_property_notify(OF_RECONFIG_REMOVE_PROPERTY, np, prop);
@@ -1721,22 +1738,11 @@ int of_remove_property(struct device_node *np, struct property *prop)
                 return rc;
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
-        next = &np->properties;
-        while (*next) {
-                if (*next == prop) {
-                        /* found the node */
-                        *next = prop->next;
-                        prop->next = np->deadprops;
-                        np->deadprops = prop;
-                        found = 1;
-                        break;
-                }
-                next = &(*next)->next;
-        }
+        rc = __of_remove_property(np, prop);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
-        if (!found)
-                return -ENODEV;
+        if (rc)
+                return rc;
 
         /* at early boot, bail hear and defer setup to of_init() */
         if (!of_kset)
@@ -1747,6 +1753,32 @@ int of_remove_property(struct device_node *np, struct property *prop)
         return 0;
 }
 
+int __of_update_property(struct device_node *np, struct property *newprop,
+                struct property **oldpropp)
+{
+        struct property **next, *oldprop;
+
+        for (next = &np->properties; *next; next = &(*next)->next) {
+                if (of_prop_cmp((*next)->name, newprop->name) == 0)
+                        break;
+        }
+        *oldpropp = oldprop = *next;
+
+        if (oldprop) {
+                /* replace the node */
+                newprop->next = oldprop->next;
+                *next = newprop;
+                oldprop->next = np->deadprops;
+                np->deadprops = oldprop;
+        } else {
+                /* new node */
+                newprop->next = NULL;
+                *next = newprop;
+        }
+
+        return 0;
+}
+
 /*
  * of_update_property - Update a property in a node, if the property does
  * not exist, add it.
@@ -1758,34 +1790,19 @@ int of_remove_property(struct device_node *np, struct property *prop)
  */
 int of_update_property(struct device_node *np, struct property *newprop)
 {
-        struct property **next, *oldprop;
+        struct property *oldprop;
         unsigned long flags;
         int rc;
 
+        if (!newprop->name)
+                return -EINVAL;
+
         rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop);
         if (rc)
                 return rc;
 
-        if (!newprop->name)
-                return -EINVAL;
-
         raw_spin_lock_irqsave(&devtree_lock, flags);
-        next = &np->properties;
-        oldprop = __of_find_property(np, newprop->name, NULL);
-        if (!oldprop) {
-                /* add the new node */
-                rc = __of_add_property(np, newprop);
-        } else while (*next) {
-                /* replace the node */
-                if (*next == oldprop) {
-                        newprop->next = oldprop->next;
-                        *next = newprop;
-                        oldprop->next = np->deadprops;
-                        np->deadprops = oldprop;
-                        break;
-                }
-                next = &(*next)->next;
-        }
+        rc = __of_update_property(np, newprop, &oldprop);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
         if (rc)
                 return rc;
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index e0c4c6e25980..75fcc66fcefd 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -94,6 +94,15 @@ int of_property_notify(int action, struct device_node *np,
         return of_reconfig_notify(action, &pr);
 }
 
+void __of_attach_node(struct device_node *np)
+{
+        np->sibling = np->parent->child;
+        np->allnext = np->parent->allnext;
+        np->parent->allnext = np;
+        np->parent->child = np;
+        of_node_clear_flag(np, OF_DETACHED);
+}
+
 /**
  * of_attach_node() - Plug a device node into the tree and global list.
  */
@@ -107,46 +116,23 @@ int of_attach_node(struct device_node *np)
                 return rc;
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
-        np->sibling = np->parent->child;
-        np->allnext = np->parent->allnext;
-        np->parent->allnext = np;
-        np->parent->child = np;
-        of_node_clear_flag(np, OF_DETACHED);
+        __of_attach_node(np);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
         of_node_add(np);
         return 0;
 }
 
-/**
- * of_detach_node() - "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.
- */
-int of_detach_node(struct device_node *np)
+void __of_detach_node(struct device_node *np)
 {
         struct device_node *parent;
-        unsigned long flags;
-        int rc = 0;
-
-        rc = of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
-        if (rc)
-                return rc;
 
-        raw_spin_lock_irqsave(&devtree_lock, flags);
-
-        if (of_node_check_flag(np, OF_DETACHED)) {
-                /* someone already detached it */
-                raw_spin_unlock_irqrestore(&devtree_lock, flags);
-                return rc;
-        }
+        if (WARN_ON(of_node_check_flag(np, OF_DETACHED)))
+                return;
 
         parent = np->parent;
-        if (!parent) {
-                raw_spin_unlock_irqrestore(&devtree_lock, flags);
-                return rc;
-        }
+        if (WARN_ON(!parent))
+                return;
 
         if (of_allnodes == np)
                 of_allnodes = np->allnext;
@@ -171,6 +157,25 @@ int of_detach_node(struct device_node *np)
         }
 
         of_node_set_flag(np, OF_DETACHED);
+}
+
+/**
+ * of_detach_node() - "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.
+ */
+int of_detach_node(struct device_node *np)
+{
+        unsigned long flags;
+        int rc = 0;
+
+        rc = of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
+        if (rc)
+                return rc;
+
+        raw_spin_lock_irqsave(&devtree_lock, flags);
+        __of_detach_node(np);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
         of_node_remove(np);
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 1799ed2b3808..0f6089722af9 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -61,4 +61,12 @@ static inline int of_property_notify(int action, struct device_node *np,
 struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags);
 struct device_node *__of_node_alloc(const char *full_name, gfp_t allocflags);
 
+extern int __of_add_property(struct device_node *np, struct property *prop);
+extern int __of_remove_property(struct device_node *np, struct property *prop);
+extern int __of_update_property(struct device_node *np,
+                struct property *newprop, struct property **oldprop);
+
+extern void __of_attach_node(struct device_node *np);
+extern void __of_detach_node(struct device_node *np);
+
 #endif /* _LINUX_OF_PRIVATE_H */