of: Constify struct property pointers

robherring · robherring · commit 9c63fea9acd0 · 2024-10-15T08:58:36.000-05:00
Most accesses to struct property do not modify it, so constify struct property pointers where ever possible in the DT core code. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20241010-dt-const-v1-4-87a51f558425@kernel.org Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
diff --git a/drivers/of/base.c b/drivers/of/base.c
@@ -270,7 +270,7 @@ EXPORT_SYMBOL(of_find_all_nodes);
 const void *__of_get_property(const struct device_node *np,
 			      const char *name, int *lenp)
 {
-	struct property *pp = __of_find_property(np, name, lenp);
+	const struct property *pp = __of_find_property(np, name, lenp);
 
 	return pp ? pp->value : NULL;
 }
@@ -282,7 +282,7 @@ const void *__of_get_property(const struct device_node *np,
 const void *of_get_property(const struct device_node *np, const char *name,
 			    int *lenp)
 {
-	struct property *pp = of_find_property(np, name, lenp);
+	const struct property *pp = of_find_property(np, name, lenp);
 
 	return pp ? pp->value : NULL;
 }
@@ -321,7 +321,7 @@ EXPORT_SYMBOL(of_get_property);
 static int __of_device_is_compatible(const struct device_node *device,
 				     const char *compat, const char *type, const char *name)
 {
-	struct property *prop;
+	const struct property *prop;
 	const char *cp;
 	int index = 0, score = 0;
 
@@ -828,7 +828,7 @@ struct device_node *__of_find_node_by_full_path(struct device_node *node,
 struct device_node *of_find_node_opts_by_path(const char *path, const char **opts)
 {
 	struct device_node *np = NULL;
-	struct property *pp;
+	const struct property *pp;
 	unsigned long flags;
 	const char *separator = strchr(path, ':');
 
@@ -974,7 +974,7 @@ struct device_node *of_find_node_with_property(struct device_node *from,
 	const char *prop_name)
 {
 	struct device_node *np;
-	struct property *pp;
+	const struct property *pp;
 	unsigned long flags;
 
 	raw_spin_lock_irqsave(&devtree_lock, flags);
@@ -1769,7 +1769,7 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np,
  */
 void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 {
-	struct property *pp;
+	const struct property *pp;
 
 	of_aliases = of_find_node_by_path("/aliases");
 	of_chosen = of_find_node_by_path("/chosen");
diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c
@@ -84,7 +84,7 @@ int __of_add_property_sysfs(struct device_node *np, struct property *pp)
 	return rc;
 }
 
-void __of_sysfs_remove_bin_file(struct device_node *np, struct property *prop)
+void __of_sysfs_remove_bin_file(struct device_node *np, const struct property *prop)
 {
 	if (!IS_ENABLED(CONFIG_SYSFS))
 		return;
@@ -93,15 +93,15 @@ void __of_sysfs_remove_bin_file(struct device_node *np, struct property *prop)
 	kfree(prop->attr.attr.name);
 }
 
-void __of_remove_property_sysfs(struct device_node *np, struct property *prop)
+void __of_remove_property_sysfs(struct device_node *np, const struct property *prop)
 {
 	/* at early boot, bail here and defer setup to of_init() */
 	if (of_kset && of_node_is_attached(np))
 		__of_sysfs_remove_bin_file(np, prop);
 }
 
 void __of_update_property_sysfs(struct device_node *np, struct property *newprop,
-		struct property *oldprop)
+		const struct property *oldprop)
 {
 	/* At early boot, bail out and defer setup to of_init() */
 	if (!of_kset)
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
@@ -69,19 +69,19 @@ static inline void of_platform_register_reconfig_notifier(void) { }
 #if defined(CONFIG_OF_KOBJ)
 int of_node_is_attached(const struct device_node *node);
 int __of_add_property_sysfs(struct device_node *np, struct property *pp);
-void __of_remove_property_sysfs(struct device_node *np, struct property *prop);
+void __of_remove_property_sysfs(struct device_node *np, const struct property *prop);
 void __of_update_property_sysfs(struct device_node *np, struct property *newprop,
-		struct property *oldprop);
+		const struct property *oldprop);
 int __of_attach_node_sysfs(struct device_node *np);
 void __of_detach_node_sysfs(struct device_node *np);
 #else
 static inline int __of_add_property_sysfs(struct device_node *np, struct property *pp)
 {
 	return 0;
 }
-static inline void __of_remove_property_sysfs(struct device_node *np, struct property *prop) {}
+static inline void __of_remove_property_sysfs(struct device_node *np, const struct property *prop) {}
 static inline void __of_update_property_sysfs(struct device_node *np,
-		struct property *newprop, struct property *oldprop) {}
+		struct property *newprop, const struct property *oldprop) {}
 static inline int __of_attach_node_sysfs(struct device_node *np)
 {
 	return 0;
@@ -142,7 +142,7 @@ extern int __of_update_property(struct device_node *np,
 extern void __of_detach_node(struct device_node *np);
 
 extern void __of_sysfs_remove_bin_file(struct device_node *np,
-				       struct property *prop);
+				       const struct property *prop);
 
 /* illegal phandle value (set when unresolved) */
 #define OF_PHANDLE_ILLEGAL	0xdeadbeef
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
@@ -296,10 +296,11 @@ static struct property *dup_and_fixup_symbol_prop(
  * invalid @overlay.
  */
 static int add_changeset_property(struct overlay_changeset *ovcs,
-		struct target *target, struct property *overlay_prop,
+		struct target *target, const struct property *overlay_prop,
 		bool is_symbols_prop)
 {
-	struct property *new_prop = NULL, *prop;
+	struct property *new_prop = NULL;
+	const struct property *prop;
 	int ret = 0;
 
 	if (target->in_livetree)
diff --git a/drivers/of/property.c b/drivers/of/property.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(of_graph_is_present);
 int of_property_count_elems_of_size(const struct device_node *np,
 				const char *propname, int elem_size)
 {
-	struct property *prop = of_find_property(np, propname, NULL);
+	const struct property *prop = of_find_property(np, propname, NULL);
 
 	if (!prop)
 		return -EINVAL;
@@ -104,7 +104,7 @@ EXPORT_SYMBOL_GPL(of_property_count_elems_of_size);
 static void *of_find_property_value_of_size(const struct device_node *np,
 			const char *propname, u32 min, u32 max, size_t *len)
 {
-	struct property *prop = of_find_property(np, propname, NULL);
+	const struct property *prop = of_find_property(np, propname, NULL);
 
 	if (!prop)
 		return ERR_PTR(-EINVAL);
@@ -530,7 +530,7 @@ int of_property_read_string_helper(const struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(of_property_read_string_helper);
 
-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;
@@ -553,7 +553,7 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
 }
 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;
 
@@ -1466,7 +1466,7 @@ static int of_fwnode_irq_get(const struct fwnode_handle *fwnode,
 
 static int of_fwnode_add_links(struct fwnode_handle *fwnode)
 {
-	struct property *p;
+	const struct property *p;
 	struct device_node *con_np = to_of_node(fwnode);
 
 	if (IS_ENABLED(CONFIG_X86))
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
@@ -42,7 +42,7 @@ static void adjust_overlay_phandles(struct device_node *overlay,
 		int phandle_delta)
 {
 	struct device_node *child;
-	struct property *prop;
+	const struct property *prop;
 	phandle phandle;
 
 	/* adjust node's phandle in node */
@@ -71,10 +71,10 @@ static void adjust_overlay_phandles(struct device_node *overlay,
 }
 
 static int update_usages_of_a_phandle_reference(struct device_node *overlay,
-		struct property *prop_fixup, phandle phandle)
+		const struct property *prop_fixup, phandle phandle)
 {
 	struct device_node *refnode;
-	struct property *prop;
+	const struct property *prop;
 	char *value __free(kfree) = kmemdup(prop_fixup->value, prop_fixup->length, GFP_KERNEL);
 	char *cur, *end, *node_path, *prop_name, *s;
 	int offset, len;
@@ -151,7 +151,7 @@ static int adjust_local_phandle_references(const struct device_node *local_fixup
 		const struct device_node *overlay, int phandle_delta)
 {
 	struct device_node *overlay_child;
-	struct property *prop_fix, *prop;
+	const struct property *prop_fix, *prop;
 	int err, i, count;
 	unsigned int off;
 
diff --git a/include/linux/of.h b/include/linux/of.h
@@ -435,7 +435,7 @@ extern int of_detach_node(struct device_node *);
  * of_property_for_each_u32(np, "propname", u)
  *         printk("U32 value: %x\n", u);
  */
-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);
 /*
  * struct property *prop;
@@ -444,7 +444,7 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
  * of_property_for_each_string(np, "propname", prop, s)
  *         printk("String value: %s\n", s);
  */
-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);
 
 bool of_console_check(const struct device_node *dn, char *name, int index);
 
@@ -826,13 +826,13 @@ static inline bool of_console_check(const struct device_node *dn, const char *na
 	return false;
 }
 
-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 NULL;
 }
 
-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;
@@ -899,7 +899,7 @@ static inline const void *of_device_get_match_data(const struct device *dev)
 #define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))
 #endif
 
-static inline int of_prop_val_eq(struct property *p1, struct property *p2)
+static inline int of_prop_val_eq(const struct property *p1, const struct property *p2)
 {
 	return p1->length == p2->length &&
 	       !memcmp(p1->value, p2->value, (size_t)p1->length);
@@ -1252,7 +1252,7 @@ static inline int of_property_read_string_index(const struct device_node *np,
 static inline bool of_property_read_bool(const struct device_node *np,
 					 const char *propname)
 {
-	struct property *prop = of_find_property(np, propname, NULL);
+	const struct property *prop = of_find_property(np, propname, NULL);
 
 	return prop ? true : false;
 }
@@ -1430,7 +1430,7 @@ static inline int of_property_read_s32(const struct device_node *np,
 	     err = of_phandle_iterator_next(it))
 
 #define of_property_for_each_u32(np, propname, u)			\
-	for (struct {struct property *prop; const __be32 *item; } _it =	\
+	for (struct {const struct property *prop; const __be32 *item; } _it =	\
 		{of_find_property(np, propname, NULL),			\
 		 of_prop_next_u32(_it.prop, NULL, &u)};			\
 	     _it.item;							\

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ EXPORT_SYMBOL(of_find_all_nodes);`
`270`	`270`	`const void __of_get_property(const struct device_node np,`
`271`	`271`	`const char name, int lenp)`
`272`	`272`	`{`
`273`		`- struct property *pp = __of_find_property(np, name, lenp);`
	`273`	`+ const struct property *pp = __of_find_property(np, name, lenp);`
`274`	`274`
`275`	`275`	`return pp ? pp->value : NULL;`
`276`	`276`	`}`
`@@ -282,7 +282,7 @@ const void __of_get_property(const struct device_node np,`
`282`	`282`	`const void of_get_property(const struct device_node np, const char *name,`
`283`	`283`	`int *lenp)`
`284`	`284`	`{`
`285`		`- struct property *pp = of_find_property(np, name, lenp);`
	`285`	`+ const struct property *pp = of_find_property(np, name, lenp);`
`286`	`286`
`287`	`287`	`return pp ? pp->value : NULL;`
`288`	`288`	`}`
`@@ -321,7 +321,7 @@ EXPORT_SYMBOL(of_get_property);`
`321`	`321`	`static int __of_device_is_compatible(const struct device_node *device,`
`322`	`322`	`const char compat, const char type, const char *name)`
`323`	`323`	`{`
`324`		`- struct property *prop;`
	`324`	`+ const struct property *prop;`
`325`	`325`	`const char *cp;`
`326`	`326`	`int index = 0, score = 0;`
`327`	`327`
`@@ -828,7 +828,7 @@ struct device_node __of_find_node_by_full_path(struct device_node node,`
`828`	`828`	`struct device_node of_find_node_opts_by_path(const char path, const char **opts)`
`829`	`829`	`{`
`830`	`830`	`struct device_node *np = NULL;`
`831`		`- struct property *pp;`
	`831`	`+ const struct property *pp;`
`832`	`832`	`unsigned long flags;`
`833`	`833`	`const char *separator = strchr(path, ':');`
`834`	`834`
`@@ -974,7 +974,7 @@ struct device_node of_find_node_with_property(struct device_node from,`
`974`	`974`	`const char *prop_name)`
`975`	`975`	`{`
`976`	`976`	`struct device_node *np;`
`977`		`- struct property *pp;`
	`977`	`+ const struct property *pp;`
`978`	`978`	`unsigned long flags;`
`979`	`979`
`980`	`980`	`raw_spin_lock_irqsave(&devtree_lock, flags);`
`@@ -1769,7 +1769,7 @@ static void of_alias_add(struct alias_prop ap, struct device_node np,`
`1769`	`1769`	`*/`
`1770`	`1770`	`void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))`
`1771`	`1771`	`{`
`1772`		`- struct property *pp;`
	`1772`	`+ const struct property *pp;`
`1773`	`1773`
`1774`	`1774`	`of_aliases = of_find_node_by_path("/aliases");`
`1775`	`1775`	`of_chosen = of_find_node_by_path("/chosen");`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ int __of_add_property_sysfs(struct device_node np, struct property pp)`
`84`	`84`	`return rc;`
`85`	`85`	`}`
`86`	`86`
`87`		`-void __of_sysfs_remove_bin_file(struct device_node np, struct property prop)`
	`87`	`+void __of_sysfs_remove_bin_file(struct device_node np, const struct property prop)`
`88`	`88`	`{`
`89`	`89`	`if (!IS_ENABLED(CONFIG_SYSFS))`
`90`	`90`	`return;`
`@@ -93,15 +93,15 @@ void __of_sysfs_remove_bin_file(struct device_node np, struct property prop)`
`93`	`93`	`kfree(prop->attr.attr.name);`
`94`	`94`	`}`
`95`	`95`
`96`		`-void __of_remove_property_sysfs(struct device_node np, struct property prop)`
	`96`	`+void __of_remove_property_sysfs(struct device_node np, const struct property prop)`
`97`	`97`	`{`
`98`	`98`	`/* at early boot, bail here and defer setup to of_init() */`
`99`	`99`	`if (of_kset && of_node_is_attached(np))`
`100`	`100`	`__of_sysfs_remove_bin_file(np, prop);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`void __of_update_property_sysfs(struct device_node np, struct property newprop,`
`104`		`- struct property *oldprop)`
	`104`	`+ const struct property *oldprop)`
`105`	`105`	`{`
`106`	`106`	`/* At early boot, bail out and defer setup to of_init() */`
`107`	`107`	`if (!of_kset)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ EXPORT_SYMBOL(of_graph_is_present);`
`68`	`68`	`int of_property_count_elems_of_size(const struct device_node *np,`
`69`	`69`	`const char *propname, int elem_size)`
`70`	`70`	`{`
`71`		`- struct property *prop = of_find_property(np, propname, NULL);`
	`71`	`+ const struct property *prop = of_find_property(np, propname, NULL);`
`72`	`72`
`73`	`73`	`if (!prop)`
`74`	`74`	`return -EINVAL;`
`@@ -104,7 +104,7 @@ EXPORT_SYMBOL_GPL(of_property_count_elems_of_size);`
`104`	`104`	`static void of_find_property_value_of_size(const struct device_node np,`
`105`	`105`	`const char propname, u32 min, u32 max, size_t len)`
`106`	`106`	`{`
`107`		`- struct property *prop = of_find_property(np, propname, NULL);`
	`107`	`+ const struct property *prop = of_find_property(np, propname, NULL);`
`108`	`108`
`109`	`109`	`if (!prop)`
`110`	`110`	`return ERR_PTR(-EINVAL);`
`@@ -530,7 +530,7 @@ int of_property_read_string_helper(const struct device_node *np,`
`530`	`530`	`}`
`531`	`531`	`EXPORT_SYMBOL_GPL(of_property_read_string_helper);`
`532`	`532`
`533`		`-const __be32 of_prop_next_u32(struct property prop, const __be32 *cur,`
	`533`	`+const __be32 of_prop_next_u32(const struct property prop, const __be32 *cur,`
`534`	`534`	`u32 *pu)`
`535`	`535`	`{`
`536`	`536`	`const void *curv = cur;`
`@@ -553,7 +553,7 @@ const __be32 of_prop_next_u32(struct property prop, const __be32 *cur,`
`553`	`553`	`}`
`554`	`554`	`EXPORT_SYMBOL_GPL(of_prop_next_u32);`
`555`	`555`
`556`		`-const char of_prop_next_string(struct property prop, const char *cur)`
	`556`	`+const char of_prop_next_string(const struct property prop, const char *cur)`
`557`	`557`	`{`
`558`	`558`	`const void *curv = cur;`
`559`	`559`
`@@ -1466,7 +1466,7 @@ static int of_fwnode_irq_get(const struct fwnode_handle *fwnode,`
`1466`	`1466`
`1467`	`1467`	`static int of_fwnode_add_links(struct fwnode_handle *fwnode)`
`1468`	`1468`	`{`
`1469`		`- struct property *p;`
	`1469`	`+ const struct property *p;`
`1470`	`1470`	`struct device_node *con_np = to_of_node(fwnode);`
`1471`	`1471`
`1472`	`1472`	`if (IS_ENABLED(CONFIG_X86))`