driver core: make kobj_type structures constant

Commit Message

Thomas Weißschuh Feb. 4, 2023, 10:36 p.m. UTC

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 definitions to prevent
modification at runtime.

Signed-off-by: Thomas Weißschuh <[e-mail]>
---
 drivers/base/bus.c    | 4 ++--
 drivers/base/class.c  | 2 +-
 drivers/base/core.c   | 4 ++--
 drivers/base/swnode.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


---
base-commit: 95078069c1e70d1b3b141132d18d0c563acedd0c
change-id: 20230204-kobj_type-driver-core-6b4bed402a5b

Best regards,

Patch

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 4ec6dbab73be..f9c05f4c7d1f 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -91,7 +91,7 @@  static void driver_release(struct kobject *kobj)
 	kfree(drv_priv);
 }
 
-static struct kobj_type driver_ktype = {
+static const struct kobj_type driver_ktype = {
 	.sysfs_ops	= &driver_sysfs_ops,
 	.release	= driver_release,
 };
@@ -158,7 +158,7 @@  static void bus_release(struct kobject *kobj)
 	bus->p = NULL;
 }
 
-static struct kobj_type bus_ktype = {
+static const struct kobj_type bus_ktype = {
 	.sysfs_ops	= &bus_sysfs_ops,
 	.release	= bus_release,
 };
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 86ec554cfe60..3a0e8cf8970c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -75,7 +75,7 @@  static const struct sysfs_ops class_sysfs_ops = {
 	.store	   = class_attr_store,
 };
 
-static struct kobj_type class_ktype = {
+static const struct kobj_type class_ktype = {
 	.sysfs_ops	= &class_sysfs_ops,
 	.release	= class_release,
 	.child_ns_type	= class_child_ns_type,
diff --git a/drivers/base/core.c b/drivers/base/core.c
index a3e14143ec0c..dd17852f1c03 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2354,7 +2354,7 @@  static void device_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t
 		dev->class->get_ownership(dev, uid, gid);
 }
 
-static struct kobj_type device_ktype = {
+static const struct kobj_type device_ktype = {
 	.release	= device_release,
 	.sysfs_ops	= &dev_sysfs_ops,
 	.namespace	= device_namespace,
@@ -2992,7 +2992,7 @@  struct kobj_ns_type_operations *class_dir_child_ns_type(const struct kobject *ko
 	return dir->class->ns_type;
 }
 
-static struct kobj_type class_dir_ktype = {
+static const struct kobj_type class_dir_ktype = {
 	.release	= class_dir_release,
 	.sysfs_ops	= &kobj_sysfs_ops,
 	.child_ns_type	= class_dir_child_ns_type
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 0a482212c7e8..81fb6d492c15 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -760,7 +760,7 @@  static void software_node_release(struct kobject *kobj)
 	kfree(swnode);
 }
 
-static struct kobj_type software_node_type = {
+static const struct kobj_type software_node_type = {
 	.release = software_node_release,
 	.sysfs_ops = &kobj_sysfs_ops,
 };