[PATCH 07/19] dm: core: Swap parameters of ofnode_write_prop()

Simon Glass sjg at chromium.org
Wed Jul 20 18:59:35 CEST 2022


It is normal for the length to come after the value in libfdt. Follow this
same convention with ofnode.

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

 drivers/core/ofnode.c | 6 +++---
 include/dm/ofnode.h   | 6 +++---
 test/dm/ofnode.c      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index bd41ef503c2..1c9542a3567 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -1105,8 +1105,8 @@ ofnode ofnode_by_prop_value(ofnode from, const char *propname,
 	}
 }
 
-int ofnode_write_prop(ofnode node, const char *propname, int len,
-		      const void *value)
+int ofnode_write_prop(ofnode node, const char *propname, const void *value,
+		      int len)
 {
 	const struct device_node *np = ofnode_to_np(node);
 	struct property *pp;
@@ -1161,7 +1161,7 @@ int ofnode_write_string(ofnode node, const char *propname, const char *value)
 
 	debug("%s: %s = %s", __func__, propname, value);
 
-	return ofnode_write_prop(node, propname, strlen(value) + 1, value);
+	return ofnode_write_prop(node, propname, value, strlen(value) + 1);
 }
 
 int ofnode_set_enabled(ofnode node, bool value)
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index d7ad5dccc14..071a9d63f67 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -1114,13 +1114,13 @@ int ofnode_device_is_compatible(ofnode node, const char *compat);
  *
  * @node:	The node for whose property should be set
  * @propname:	The name of the property to set
- * @len:	The length of the new value of the property
  * @value:	The new value of the property (must be valid prior to calling
  *		the function)
+ * @len:	The length of the new value of the property
  * Return: 0 if successful, -ve on error
  */
-int ofnode_write_prop(ofnode node, const char *propname, int len,
-		      const void *value);
+int ofnode_write_prop(ofnode node, const char *propname, const void *value,
+		      int len);
 
 /**
  * ofnode_write_string() - Set a string property of a ofnode
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index b8d8e440dbc..0aeaaeb7f8c 100644
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -576,8 +576,8 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts)
 	/* Non-existent in DTB */
 	ut_asserteq_64(FDT_ADDR_T_NONE, dev_read_addr(dev));
 	/* reg = 0x42, size = 0x100 */
-	ut_assertok(ofnode_write_prop(node, "reg", 8,
-				      "\x00\x00\x00\x42\x00\x00\x01\x00"));
+	ut_assertok(ofnode_write_prop(node, "reg",
+				      "\x00\x00\x00\x42\x00\x00\x01\x00", 8));
 	ut_asserteq(0x42, dev_read_addr(dev));
 
 	/* Test disabling devices */
-- 
2.37.0.170.g444d1eabd0-goog



More information about the U-Boot mailing list