Skip to content

Commit 99fea94

Browse files
rbmarlierevinodkoul
authored andcommitted
soundwire: constify the struct device_type usage
Since commit aed65af ("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>
1 parent 81a7d0c commit 99fea94

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/soundwire/master.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static const struct dev_pm_ops master_dev_pm = {
112112
pm_generic_runtime_resume, NULL)
113113
};
114114

115-
struct device_type sdw_master_type = {
115+
const struct device_type sdw_master_type = {
116116
.name = "soundwire_master",
117117
.release = sdw_master_device_release,
118118
.pm = &master_dev_pm,

drivers/soundwire/slave.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static void sdw_slave_release(struct device *dev)
1616
kfree(slave);
1717
}
1818

19-
struct device_type sdw_slave_type = {
19+
const struct device_type sdw_slave_type = {
2020
.name = "sdw_slave",
2121
.release = sdw_slave_release,
2222
.uevent = sdw_slave_uevent,

include/linux/soundwire/sdw_type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define __SOUNDWIRE_TYPES_H
66

77
extern const struct bus_type sdw_bus_type;
8-
extern struct device_type sdw_slave_type;
9-
extern struct device_type sdw_master_type;
8+
extern const struct device_type sdw_slave_type;
9+
extern const struct device_type sdw_master_type;
1010

1111
static inline int is_sdw_slave(const struct device *dev)
1212
{

0 commit comments

Comments
 (0)