[PATCH] of: base: constify some property pointers

Trent Piepho tpiepho at gmail.com
Fri May 28 23:25:41 PDT 2021


Make the propery pointers in a few OF functions that read data const.
They don't modify the property.

Signed-off-by: Trent Piepho <tpiepho at gmail.com>
---
 drivers/of/base.c |  4 ++--
 include/of.h      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 6fe02649e..04814c8f7 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1048,7 +1048,7 @@ int of_property_match_string(struct device_node *np, const char *propname,
 }
 EXPORT_SYMBOL_GPL(of_property_match_string);
 
-const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
+const __be32 *of_prop_next_u32(const struct property *prop, const __be32 *cur,
 			u32 *pu)
 {
 	const void *curv = cur;
@@ -1074,7 +1074,7 @@ out_val:
 }
 EXPORT_SYMBOL_GPL(of_prop_next_u32);
 
-const char *of_prop_next_string(struct property *prop, const char *cur)
+const char *of_prop_next_string(const struct property *prop, const char *cur)
 {
 	const void *curv = cur;
 	const void *value;
diff --git a/include/of.h b/include/of.h
index 645f429bd..4adbb7d54 100644
--- a/include/of.h
+++ b/include/of.h
@@ -95,7 +95,7 @@ static inline void of_write_number(void *__cell, u64 val, int size)
 	}
 }
 
-static inline const void *of_property_get_value(struct property *pp)
+static inline const void *of_property_get_value(const struct property *pp)
 {
 	return pp->value ? pp->value : pp->value_const;
 }
@@ -216,9 +216,9 @@ extern int of_property_read_string_helper(const struct device_node *np,
 					      const char *propname,
 					      const char **out_strs, size_t sz, int index);
 
-extern const __be32 *of_prop_next_u32(struct property *prop,
+extern const __be32 *of_prop_next_u32(const struct property *prop,
 				const __be32 *cur, u32 *pu);
-extern const char *of_prop_next_string(struct property *prop, const char *cur);
+extern const char *of_prop_next_string(const struct property *prop, const char *cur);
 
 extern int of_property_write_bool(struct device_node *np,
 				const char *propname, const bool value);
@@ -520,13 +520,13 @@ static inline int of_property_read_string_helper(const struct device_node *np,
 	return -ENOSYS;
 }
 
-static inline const __be32 *of_prop_next_u32(struct property *prop,
+static inline const __be32 *of_prop_next_u32(const struct property *prop,
 					const __be32 *cur, u32 *pu)
 {
 	return 0;
 }
 
-static inline const char *of_prop_next_string(struct property *prop,
+static inline const char *of_prop_next_string(const struct property *prop,
 					const char *cur)
 {
 	return NULL;
-- 
2.26.2




More information about the barebox mailing list