of: Refactor __of_node_alloc() into __of_node_dup()

Add a node argument to __of_node_alloc() and rename it to
__of_node_dup() so that it can also be used to duplicate a node with
its properties. This is important for the overlay code so that it can
create new nodes without using separate changeset items for every single
property.

At the same time rework the overlay code to use the new function and
drop the extra changeset items.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit e51795815ef1a7adc018cbaf05aac46e3d24eda8)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
	drivers/of/unittest.c

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 4eaee3ef2fac7ab31ce4b9d5dd9dcd802396f7eb..16524c8e95ec34cf03879eff0b5133ca9373bd0d 100644 (file)
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -404,15 +404,16 @@ struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags)
 }
 
 /**
- * __of_node_alloc() - Create an empty device node dynamically.
- * @full_name: Full name of the new device node
+ * __of_node_dup() - Duplicate or create an empty device node dynamically.
+ * @fmt: Format string (plus vargs) for new full name of the device node
  *
- * Create an empty device tree node, suitable for further modification.
- * The node data are dynamically allocated and all the node flags
- * have the OF_DYNAMIC & OF_DETACHED bits set.
- * Returns the newly allocated node or NULL on out of memory error.
+ * Create an device tree node, either by duplicating an empty node or by allocating
+ * an empty one suitable for further modification.  The node data are
+ * dynamically allocated and all the node flags have the OF_DYNAMIC &
+ * OF_DETACHED bits set. Returns the newly allocated node or NULL on out of
+ * memory error.
  */
-struct device_node *__of_node_alloc(const char *fmt, ...)
+struct device_node *__of_node_dup(const struct device_node *np, const char *fmt, ...)
 {
        va_list vargs;
        struct device_node *node;
@@ -423,17 +424,34 @@ struct device_node *__of_node_alloc(const char *fmt, ...)
        va_start(vargs, fmt);
        node->full_name = kvasprintf(GFP_KERNEL, fmt, vargs);
        va_end(vargs);
-       if (!node->full_name)
-               goto err_free;
+       if (!node->full_name) {
+               kfree(node);
+               return NULL;
+       }
 
        of_node_set_flag(node, OF_DYNAMIC);
        of_node_set_flag(node, OF_DETACHED);
        of_node_init(node);
 
+       /* Iterate over and duplicate all properties */
+       if (np) {
+               struct property *pp, *new_pp;
+               for_each_property_of_node(np, pp) {
+                       new_pp = __of_prop_dup(pp, GFP_KERNEL);
+                       if (!new_pp)
+                               goto err_prop;
+                       if (__of_add_property(node, new_pp)) {
+                               kfree(new_pp->name);
+                               kfree(new_pp->value);
+                               kfree(new_pp);
+                               goto err_prop;
+                       }
+               }
+       }
        return node;
 
- err_free:
-       kfree(node);
+ err_prop:
+       of_node_put(node); /* Frees the node and properties */
        return NULL;
 }
 

diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 618abcad307e3c54efd4227e83b6f57346934b67..8e882e706cd8c6b4edc61f577d7808e0e6e74df7 100644 (file)
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -61,7 +61,7 @@ static inline int of_property_notify(int action, struct device_node *np,
  * own the devtree lock or work on detached trees only.
  */
 struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags);
-__printf(1, 2) struct device_node *__of_node_alloc(const char *fmt, ...);
+__printf(2, 3) struct device_node *__of_node_dup(const struct device_node *np, const char *fmt, ...);
 
 extern const void *__of_get_property(const struct device_node *np,
                                     const char *name, int *lenp);

diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c
index 93058d08f70b976350eb14e062297f750b91c617..04cb9e5a8292d1b7bbde60b7d5e32e2dc8f87d71 100644 (file)
--- a/drivers/of/selftest.c
+++ b/drivers/of/selftest.c
@@ -195,11 +195,11 @@ static void __init of_selftest_changeset(void)
        struct of_changeset chgset;
 
        of_changeset_init(&chgset);
-       n1 = __of_node_alloc("/testcase-data/changeset/n1", GFP_KERNEL);
+       n1 = __of_node_dup(NULL, "/testcase-data/changeset/n1");
        selftest(n1, "testcase setup failure\n");
-       n2 = __of_node_alloc("/testcase-data/changeset/n2", GFP_KERNEL);
+       n2 = __of_node_dup(NULL, "/testcase-data/changeset/n2");
        selftest(n2, "testcase setup failure\n");
-       n21 = __of_node_alloc("/testcase-data/changeset/n2/n21", GFP_KERNEL);
+       n21 = __of_node_dup(NULL, "%s/%s", "/testcase-data/changeset/n2", "n21");
        selftest(n21, "testcase setup failure %p\n", n21);
        nremove = of_find_node_by_path("/testcase-data/changeset/node-remove");
        selftest(nremove, "testcase setup failure\n");