[PATCH] soundwire: constify the struct device_type usage

Ricardo B. Marliere posted 1 patch 1 year, 11 months ago
drivers/soundwire/master.c         | 2 +-
drivers/soundwire/slave.c          | 2 +-
include/linux/soundwire/sdw_type.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
[PATCH] soundwire: constify the struct device_type usage
Posted by Ricardo B. Marliere 1 year, 11 months ago
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>
---
 drivers/soundwire/master.c         | 2 +-
 drivers/soundwire/slave.c          | 2 +-
 include/linux/soundwire/sdw_type.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c
index 51abedbbaa66..b2c64512739d 100644
--- 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 060c2982e26b..9963b92eb505 100644
--- 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 b445f7200f06..693320b4f5c2 100644
--- 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)
 {

---
base-commit: 81a7d0c4d059cb5c122110acbeec7bedfb91a741
change-id: 20240219-device_cleanup-soundwire-c037fffa2746

Best regards,
-- 
Ricardo B. Marliere <ricardo@marliere.net>
Re: [PATCH] soundwire: constify the struct device_type usage
Posted by Vinod Koul 1 year, 11 months ago
On Mon, 19 Feb 2024 09:14:36 -0300, Ricardo B. Marliere wrote:
> 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.
> 
> 
> [...]

Applied, thanks!

[1/1] soundwire: constify the struct device_type usage
      commit: 99fea943d9dc2500227bced9acd671e5b39a1471

Best regards,
-- 
~Vinod