driver core: move sysfs_dev_char_kobj out of class.h

The structure sysfs_dev_char_kobj is local only to the driver core code,
so move it out of the global class.h file and into the internal base.h
file as no one else should be touching this symbol.

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

diff --git a/drivers/base/base.h b/drivers/base/base.h
index d3e081dc4b13323332d48e5cec63b3100d5a3e89..2867ca4ee4ce6676ddc0d3f71b02123044c06f52 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -189,6 +189,9 @@ const char *device_get_devnode(const struct device *dev, umode_t *mode,
 extern struct kset *devices_kset;
 void devices_kset_move_last(struct device *dev);
 
+/* /sys/dev/char directory */
+extern struct kobject *sysfs_dev_char_kobj;
+
 #if defined(CONFIG_MODULES) && defined(CONFIG_SYSFS)
 void module_add_driver(struct module *mod, struct device_driver *drv);
 void module_remove_driver(struct device_driver *drv);

diff --git a/include/linux/device/class.h b/include/linux/device/class.h
index 1dc7706cb42d8ae7fa1f7e007a11eb3d16880e6c..d3960733c0fa86d0485be76b99f1f3a3ede0e255 100644 (file)
--- a/include/linux/device/class.h
+++ b/include/linux/device/class.h
@@ -81,7 +81,6 @@ struct class_dev_iter {
 };
 
 extern struct kobject *sysfs_dev_block_kobj;
-extern struct kobject *sysfs_dev_char_kobj;
 
 int __must_check class_register(struct class *class);
 void class_unregister(struct class *class);