driver core: class: remove dev_kobj from struct class

The dev_kobj field in struct class is now only written to, but never
read from, so it can be removed as it is useless.

Acked-by: Rafael J. Wysocki <rafael@kernel.org>
Link: https://lore.kernel.org/r/20230331093318.82288-5-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/block/genhd.c b/block/genhd.c
index e1e1230b1b9f63933f69ad3d94602c495f4c336d..af7208a37c535ea47a2260d2568648b69fbac52a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -899,7 +899,6 @@ static int __init genhd_device_init(void)
 {
        int error;
 
-       block_class.dev_kobj = sysfs_dev_block_kobj;
        error = class_register(&block_class);
        if (unlikely(error))
                return error;

diff --git a/drivers/base/class.c b/drivers/base/class.c
index fcfb295363cc273b4553241acefbef1cdf8820f8..06b96d6faa19c26603a6e2ddf35eefaba1f065db 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -197,10 +197,6 @@ int class_register(struct class *cls)
                return error;
        }
 
-       /* set the default /sys/dev directory for devices of this class */
-       if (!cls->dev_kobj)
-               cls->dev_kobj = sysfs_dev_char_kobj;
-
        cp->subsys.kobj.kset = class_kset;
        cp->subsys.kobj.ktype = &class_ktype;
        cp->class = cls;

diff --git a/include/linux/device/class.h b/include/linux/device/class.h
index f7aad64e256addcba71fcd7b14f4b71b832a6a15..e946642c314e70b99a54994c84cb3b7ef92848da 100644 (file)
--- a/include/linux/device/class.h
+++ b/include/linux/device/class.h
@@ -27,7 +27,6 @@ struct fwnode_handle;
  * @name:      Name of the class.
  * @class_groups: Default attributes of this class.
  * @dev_groups:        Default attributes of the devices that belong to the class.
- * @dev_kobj:  The kobject that represents this class and links it into the hierarchy.
  * @dev_uevent:        Called when a device is added, removed from this class, or a
  *             few other things that generate uevents to add the environment
  *             variables.
@@ -55,7 +54,6 @@ struct class {
 
        const struct attribute_group    **class_groups;
        const struct attribute_group    **dev_groups;
-       struct kobject                  *dev_kobj;
 
        int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env);
        char *(*devnode)(const struct device *dev, umode_t *mode);