2023-02-04 05:47:12

by Thomas Weißschuh

Subject: [PATCH] of: make of_node_ktype constant

Since commit ee6d3dd4ed48 ("driver core: make kobj_type constant.")
the driver core allows the usage of const struct kobj_type.

Take advantage of this to constify the structure definition to prevent
modification at runtime.

Signed-off-by: Thomas Weißschuh <[email protected]>
---
drivers/of/kobj.c | 2 +-
include/linux/of.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c
index 7d3853a5a09a..3dbce1e6f184 100644
--- a/drivers/of/kobj.c
+++ b/drivers/of/kobj.c
@@ -24,7 +24,7 @@ static void of_node_release(struct kobject *kobj)
}
#endif /* CONFIG_OF_DYNAMIC */

-struct kobj_type of_node_ktype = {
+const struct kobj_type of_node_ktype = {
.release = of_node_release,
};

diff --git a/include/linux/of.h b/include/linux/of.h
index 8b9f94386dc3..8bb348666709 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -101,7 +101,7 @@ struct of_reconfig_data {
};

/* initialize a node */
-extern struct kobj_type of_node_ktype;
+extern const struct kobj_type of_node_ktype;
extern const struct fwnode_operations of_fwnode_ops;
static inline void of_node_init(struct device_node *node)
{

---
base-commit: 0136d86b78522bbd5755f8194c97a987f0586ba5
change-id: 20230204-kobj_type-of-cc701bdb2730

Best regards,
--
Thomas Weißschuh <[email protected]>

2023-02-06 16:24:57

by Rob Herring (Arm)

Subject: Re: [PATCH] of: make of_node_ktype constant

On Sat, 04 Feb 2023 05:47:03 +0000, Thomas Wei?schuh wrote:
> Since commit ee6d3dd4ed48 ("driver core: make kobj_type constant.")
> the driver core allows the usage of const struct kobj_type.
>
> Take advantage of this to constify the structure definition to prevent
> modification at runtime.
>
> Signed-off-by: Thomas Wei?schuh <[email protected]>
> ---
> drivers/of/kobj.c | 2 +-
> include/linux/of.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>

Applied, thanks!