Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 23:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-09-26 08:14:37 -06:00 • committed by Tom Rini
parent a17e1e76c8
commit 247970978d
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot/vbe_request.c
View file

@ -187,7 +187,7 @@ static int bootmeth_vbe_ft_fixup(void *ctx, struct event *event)
ret = ofnode_add_subnode(dest_parent, name, &dest); ret = ofnode_add_subnode(dest_parent, name, &dest);
if (ret && ret != -EEXIST) if (ret && ret != -EEXIST)
return log_msg_ret("add", ret); return log_msg_ret("add", ret);
ret = ofnode_copy_props(node, dest); ret = ofnode_copy_props(dest, node);
if (ret) if (ret)
return log_msg_ret("cp", ret); return log_msg_ret("cp", ret);

2
boot/vbe_simple_os.c
View file

@ -94,7 +94,7 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event)
/* Copy over the vbe properties for fwupd */ /* Copy over the vbe properties for fwupd */
log_debug("Fixing up: %s\n", dev->name); 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) if (ret)
return log_msg_ret("cp", ret); return log_msg_ret("cp", ret);

2
drivers/core/ofnode.c
View file

@ -1731,7 +1731,7 @@ int ofnode_add_subnode(ofnode node, const char *name, ofnode *subnodep)
return ret; /* 0 or -EEXIST */ return ret; /* 0 or -EEXIST */
} }
int ofnode_copy_props(ofnode src, ofnode dst) int ofnode_copy_props(ofnode dst, ofnode src)
{ {
struct ofprop prop; struct ofprop prop;

6
include/dm/ofnode.h
View file

@ -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 * 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 * Existing properties in the destination node remain unchanged, except that
* any with the same name are overwritten, including changing the size of the * any with the same name are overwritten, including changing the size of the
* property. * 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 * For livetree, properties are copied / allocated, so the source tree does not
* need to be present afterwards. * need to be present afterwards.
* *
* @dst: Destination node to write properties to
* @src: Source node to read properties from * @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 #endif

9
test/dm/ofnode.c
View file

@ -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); DM_TEST(dm_test_ofnode_too_many, UT_TESTF_SCAN_FDT);
static int check_copy_props(struct unit_test_state *uts, ofnode src, static int check_copy_props(struct unit_test_state *uts, ofnode dst, ofnode src)
ofnode dst)
{ {
u32 reg[2], val; 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_assertok(ofnode_read_u32(dst, "ping-expect", &val));
ut_asserteq(3, 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"); src = ofnode_path("/b-test");
dst = ofnode_path("/some-bus"); 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 */ /* check a property that is in the destination already */
ut_asserteq_str("mux0", ofnode_read_string(dst, "mux-control-names")); 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"); src = ofnode_path("/b-test");
dst = oftree_path(otree, "/node/subnode2"); dst = oftree_path(otree, "/node/subnode2");
ut_assertok(check_copy_props(uts, src, dst)); ut_assertok(check_copy_props(uts, dst, src));
return 0; return 0;
} }