From: Greg Kroah-Hartman Date: Tue, 19 Dec 2023 14:59:32 +0000 (+0100) Subject: firewire: make fw_bus_type const X-Git-Tag: microblaze-v6.10~598^2~8 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=10416a3578ba5f76d0b161d2d36a1d8a4c46a69d;p=linux-2.6-microblaze.git firewire: make fw_bus_type const Now that the driver core can properly handle constant struct bus_type, move the fw_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime. Cc: Takashi Sakamoto Cc: linux1394-devel@lists.sourceforge.net Signed-off-by: Greg Kroah-Hartman Link: https://lore.kernel.org/r/2023121931-skydiver-dodgy-d1bd@gregkh Signed-off-by: Takashi Sakamoto --- diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 2828e9573e90..7ca8e31dadb5 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -219,7 +219,7 @@ static int fw_unit_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -struct bus_type fw_bus_type = { +const struct bus_type fw_bus_type = { .name = "firewire", .match = fw_unit_match, .probe = fw_unit_probe, diff --git a/include/linux/firewire.h b/include/linux/firewire.h index bd3fc75d4f14..dd9f2d765e68 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -75,7 +75,7 @@ void fw_csr_iterator_init(struct fw_csr_iterator *ci, const u32 *p); int fw_csr_iterator_next(struct fw_csr_iterator *ci, int *key, int *value); int fw_csr_string(const u32 *directory, int key, char *buf, size_t size); -extern struct bus_type fw_bus_type; +extern const struct bus_type fw_bus_type; struct fw_card_driver; struct fw_node;