dm: core: Rename ofnode_get_first/next_property()

Drop the 'get' in these names since it does not fit with the rest of
the API.

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

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index caf28c68c4aa05bf2bcb13a9969623c2ffff0b4c..2feca567a880a14dc0fcfb9ef68a1cf17cf8418a 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -780,7 +780,7 @@ const void *ofnode_get_property(ofnode node, const char *propname, int *lenp)
                                   propname, lenp);
 }
 
-int ofnode_get_first_property(ofnode node, struct ofprop *prop)
+int ofnode_first_property(ofnode node, struct ofprop *prop)
 {
        prop->node = node;
 
@@ -799,7 +799,7 @@ int ofnode_get_first_property(ofnode node, struct ofprop *prop)
        return 0;
 }
 
-int ofnode_get_next_property(struct ofprop *prop)
+int ofnode_next_property(struct ofprop *prop)
 {
        if (ofnode_is_np(prop->node)) {
                prop->prop = of_get_next_property(ofnode_to_np(prop->node),

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 07ab8ab41c6317f640b0b5c1d0bcab812c185f43..df298d50cd90d9c6b250e0356dd6768faebc6062 100644 (file)
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -287,12 +287,12 @@ const void *dev_read_prop(const struct udevice *dev, const char *propname,
 
 int dev_read_first_prop(const struct udevice *dev, struct ofprop *prop)
 {
-       return ofnode_get_first_property(dev_ofnode(dev), prop);
+       return ofnode_first_property(dev_ofnode(dev), prop);
 }
 
 int dev_read_next_prop(struct ofprop *prop)
 {
-       return ofnode_get_next_property(prop);
+       return ofnode_next_property(prop);
 }
 
 const void *dev_read_prop_by_prop(struct ofprop *prop,

diff --git a/env/common.c b/env/common.c
index 8dd05ff76d94010cc6f509e85ec8abc51000de77..4e70baaee836ff84f441ad58df4d2dc000762f15 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -539,9 +539,9 @@ void env_import_fdt(void)
                return;
        }
 
-       for (res = ofnode_get_first_property(node, &prop);
+       for (res = ofnode_first_property(node, &prop);
             !res;
-            res = ofnode_get_next_property(&prop)) {
+            res = ofnode_next_property(&prop)) {
                const char *name, *val;
 
                val = ofnode_get_property_by_prop(&prop, &name, NULL);

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 044546f00512886d0b5e411777dc4de95ca26858..d477ef1762432c8982889de1a51c36152050aee9 100644 (file)
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -799,7 +799,7 @@ int ofnode_decode_display_timing(ofnode node, int index,
 const void *ofnode_get_property(ofnode node, const char *propname, int *lenp);
 
 /**
- * ofnode_get_first_property()- get the reference of the first property
+ * ofnode_first_property()- get the reference of the first property
  *
  * Get reference to the first property of the node, it is used to iterate
  * and read all the property with ofnode_get_property_by_prop().
@@ -808,10 +808,10 @@ const void *ofnode_get_property(ofnode node, const char *propname, int *lenp);
  * @prop: place to put argument reference
  * Return: 0 if OK, -ve on error. -FDT_ERR_NOTFOUND if not found
  */
-int ofnode_get_first_property(ofnode node, struct ofprop *prop);
+int ofnode_first_property(ofnode node, struct ofprop *prop);
 
 /**
- * ofnode_get_next_property() - get the reference of the next property
+ * ofnode_next_property() - get the reference of the next property
  *
  * Get reference to the next property of the node, it is used to iterate
  * and read all the property with ofnode_get_property_by_prop().
@@ -819,7 +819,7 @@ int ofnode_get_first_property(ofnode node, struct ofprop *prop);
  * @prop: reference of current argument and place to put reference of next one
  * Return: 0 if OK, -ve on error. -FDT_ERR_NOTFOUND if not found
  */
-int ofnode_get_next_property(struct ofprop *prop);
+int ofnode_next_property(struct ofprop *prop);
 
 /**
  * ofnode_get_property_by_prop() - get a pointer to the value of a property

diff --git a/include/dm/read.h b/include/dm/read.h
index 122b9cd15b80e9c6ee0766b79193d47a06962d17..519c156e1c02092160f4f01c488492ae405fe3d5 100644 (file)
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -569,7 +569,7 @@ const void *dev_read_prop(const struct udevice *dev, const char *propname,
 int dev_read_first_prop(const struct udevice *dev, struct ofprop *prop);
 
 /**
- * ofnode_get_next_property() - get the reference of the next property
+ * ofnode_next_property() - get the reference of the next property
  *
  * Get reference to the next property of the node, it is used to iterate
  * and read all the property with dev_read_prop_by_prop().
@@ -1079,12 +1079,12 @@ static inline const void *dev_read_prop(const struct udevice *dev,
 
 static inline int dev_read_first_prop(const struct udevice *dev, struct ofprop *prop)
 {
-       return ofnode_get_first_property(dev_ofnode(dev), prop);
+       return ofnode_first_property(dev_ofnode(dev), prop);
 }
 
 static inline int dev_read_next_prop(struct ofprop *prop)
 {
-       return ofnode_get_next_property(prop);
+       return ofnode_next_property(prop);
 }
 
 static inline const void *dev_read_prop_by_prop(struct ofprop *prop,

diff --git a/test/dm/ofread.c b/test/dm/ofread.c
index 8c7dd825136eed87a4d9e21a3331e98e04771b02..95a24c3f42bd41c2b7d3890074ef72659696142e 100644 (file)
--- a/test/dm/ofread.c
+++ b/test/dm/ofread.c
@@ -14,9 +14,9 @@ static int dm_test_ofnode_get_property_by_prop(struct unit_test_state *uts)
        int res, len, count = 0;
 
        node = ofnode_path("/cros-ec/flash");
-       for (res = ofnode_get_first_property(node, &prop);
+       for (res = ofnode_first_property(node, &prop);
             !res;
-            res = ofnode_get_next_property(&prop)) {
+            res = ofnode_next_property(&prop)) {
                value = ofnode_get_property_by_prop(&prop, &propname, &len);
                ut_assertnonnull(value);
                switch (count) {