soundwire: constify the struct device_type usage

Since commit aed65af1cc2f ("drivers: make device_type const"), the driver
core can properly handle constant struct device_type. Move the
sdw_master_type and sdw_slave_type variables to be constant structures as
well, placing it into read-only memory which can not be modified at
runtime.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: "Ricardo B. Marliere" <ricardo@marliere.net>
Link: https://lore.kernel.org/r/20240219-device_cleanup-soundwire-v1-1-9edd51767611@marliere.net
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c
index 51abedbbaa6630e53ab301b85d6dcefe2f8ce9ac..b2c64512739d674a4b00c132ee2d61a973daad8b 100644 (file)
--- a/drivers/soundwire/master.c
+++ b/drivers/soundwire/master.c
@@ -112,7 +112,7 @@ static const struct dev_pm_ops master_dev_pm = {
                           pm_generic_runtime_resume, NULL)
 };
 
-struct device_type sdw_master_type = {
+const struct device_type sdw_master_type = {
        .name =         "soundwire_master",
        .release =      sdw_master_device_release,
        .pm = &master_dev_pm,

diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 060c2982e26b009d561eafcbf81b888ada781fd4..9963b92eb50536d5e44b36409023fe95a6c5475f 100644 (file)
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -16,7 +16,7 @@ static void sdw_slave_release(struct device *dev)
        kfree(slave);
 }
 
-struct device_type sdw_slave_type = {
+const struct device_type sdw_slave_type = {
        .name =         "sdw_slave",
        .release =      sdw_slave_release,
        .uevent =       sdw_slave_uevent,

diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h
index b445f7200f0661d923c350917f5c30be02ec47da..693320b4f5c2775799852a061eb840e7613c8a0f 100644 (file)
--- a/include/linux/soundwire/sdw_type.h
+++ b/include/linux/soundwire/sdw_type.h
@@ -5,8 +5,8 @@
 #define __SOUNDWIRE_TYPES_H
 
 extern const struct bus_type sdw_bus_type;
-extern struct device_type sdw_slave_type;
-extern struct device_type sdw_master_type;
+extern const struct device_type sdw_slave_type;
+extern const struct device_type sdw_master_type;
 
 static inline int is_sdw_slave(const struct device *dev)
 {