dm: core: Reverse the argument order in ofnode_copy_props()

Follow the order used by memcpy() as it may be less confusing.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/vbe_request.c b/boot/vbe_request.c
index 2f218d4bf97cde87c0b6b126f760ea019236125a..917251afa1ca15128038d755c554edbe228b4758 100644 (file)
--- a/boot/vbe_request.c
+++ b/boot/vbe_request.c
@@ -187,7 +187,7 @@ static int bootmeth_vbe_ft_fixup(void *ctx, struct event *event)
                ret = ofnode_add_subnode(dest_parent, name, &dest);
                if (ret && ret != -EEXIST)
                        return log_msg_ret("add", ret);
-               ret = ofnode_copy_props(node, dest);
+               ret = ofnode_copy_props(dest, node);
                if (ret)
                        return log_msg_ret("cp", ret);
 

diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c
index 3285e438a56830e1391bd006cf015efeb8554214..84626cdeaf24a9c9051a5a68dded112246b83d49 100644 (file)
--- a/boot/vbe_simple_os.c
+++ b/boot/vbe_simple_os.c
@@ -94,7 +94,7 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event)
 
                /* Copy over the vbe properties for fwupd */
                log_debug("Fixing up: %s\n", dev->name);
-               ret = ofnode_copy_props(dev_ofnode(dev), subnode);
+               ret = ofnode_copy_props(subnode, dev_ofnode(dev));
                if (ret)
                        return log_msg_ret("cp", ret);
 

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 2cafa7bca5b357f4876f0c6b3df1156680da960c..515396c62f4997677a6d10ab10bcbfd495726e71 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -1731,7 +1731,7 @@ int ofnode_add_subnode(ofnode node, const char *name, ofnode *subnodep)
        return ret;     /* 0 or -EEXIST */
 }
 
-int ofnode_copy_props(ofnode src, ofnode dst)
+int ofnode_copy_props(ofnode dst, ofnode src)
 {
        struct ofprop prop;
 

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 06c969c61fe86965e9b524d1c399e94bfaddd47b..32917f6615573d2367557511059a860e1b15456d 100644 (file)
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -1598,7 +1598,7 @@ int ofnode_add_subnode(ofnode parent, const char *name, ofnode *nodep);
 /**
  * ofnode_copy_props() - copy all properties from one node to another
  *
- * Makes a copy of all properties from the source note in the destination node.
+ * Makes a copy of all properties from the source node to the destination node.
  * Existing properties in the destination node remain unchanged, except that
  * any with the same name are overwritten, including changing the size of the
  * property.
@@ -1606,9 +1606,9 @@ int ofnode_add_subnode(ofnode parent, const char *name, ofnode *nodep);
  * For livetree, properties are copied / allocated, so the source tree does not
  * need to be present afterwards.
  *
+ * @dst: Destination node to write properties to
  * @src: Source node to read properties from
- * @dst: Destination node to write properties too
  */
-int ofnode_copy_props(ofnode src, ofnode dst);
+int ofnode_copy_props(ofnode dst, ofnode src);
 
 #endif

diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index d71faac0ee4381532e561c1f47d0465dc70bc20a..dee71ee5e545f27dd9ef852bd70a5a489784e09f 100644 (file)
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -1209,12 +1209,11 @@ static int dm_test_ofnode_too_many(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_ofnode_too_many, UT_TESTF_SCAN_FDT);
 
-static int check_copy_props(struct unit_test_state *uts, ofnode src,
-                           ofnode dst)
+static int check_copy_props(struct unit_test_state *uts, ofnode dst, ofnode src)
 {
        u32 reg[2], val;
 
-       ut_assertok(ofnode_copy_props(src, dst));
+       ut_assertok(ofnode_copy_props(dst, src));
 
        ut_assertok(ofnode_read_u32(dst, "ping-expect", &val));
        ut_asserteq(3, val);
@@ -1246,7 +1245,7 @@ static int dm_test_ofnode_copy_props(struct unit_test_state *uts)
        src = ofnode_path("/b-test");
        dst = ofnode_path("/some-bus");
 
-       ut_assertok(check_copy_props(uts, src, dst));
+       ut_assertok(check_copy_props(uts, dst, src));
 
        /* check a property that is in the destination already */
        ut_asserteq_str("mux0", ofnode_read_string(dst, "mux-control-names"));
@@ -1262,7 +1261,7 @@ static int dm_test_ofnode_copy_props_ot(struct unit_test_state *uts)
 
        src = ofnode_path("/b-test");
        dst = oftree_path(otree, "/node/subnode2");
-       ut_assertok(check_copy_props(uts, src, dst));
+       ut_assertok(check_copy_props(uts, dst, src));
 
        return 0;
 }