driver core: bus: constantify bus_register()

bus_register() is now safe to take a constant * to bus_type, so make
that change and mark the subsys_private bus_type * constant as well.

Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Link: https://lore.kernel.org/r/20230313182918.1312597-24-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 f1034e27e65183ff21cd9df8179c3f20d7f3c011..09c6682d16b54b303d98c57cf3a078126491b27b 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -49,7 +49,7 @@ struct subsys_private {
        struct klist klist_drivers;
        struct blocking_notifier_head bus_notifier;
        unsigned int drivers_autoprobe:1;
-       struct bus_type *bus;
+       const struct bus_type *bus;
        struct device *dev_root;
 
        struct kset glue_dirs;

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 819ab745fa9f087c4ee8e26495af4df303e5f09e..f739a2a79e59d79bee2847a1f69e8fa7267cb053 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -841,7 +841,7 @@ static struct bus_attribute bus_attr_uevent = __ATTR(uevent, 0200, NULL,
  * infrastructure, then register the children subsystems it has:
  * the devices and drivers that belong to the subsystem.
  */
-int bus_register(struct bus_type *bus)
+int bus_register(const struct bus_type *bus)
 {
        int retval;
        struct subsys_private *priv;

diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h
index 78c875386c06dff46cfc6a20ee80f0fef13feeec..c30c4748c1703baf3dc488eb63e4277c54f727df 100644 (file)
--- a/include/linux/device/bus.h
+++ b/include/linux/device/bus.h
@@ -110,7 +110,7 @@ struct bus_type {
        bool need_parent_lock;
 };
 
-extern int __must_check bus_register(struct bus_type *bus);
+extern int __must_check bus_register(const struct bus_type *bus);
 
 extern void bus_unregister(const struct bus_type *bus);