diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 17:48:38 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 17:48:49 +0300 |
| commit | 62080509734f654c26f811c4e8e93fa357826661 (patch) | |
| tree | bf0662bd1e442ec3c3c0de11e5d745b5ad5b0958 | |
| parent | d22ee157fb2525fd0c35b9d18fd58ed2e4715f80 (diff) | |
| parent | 989e8661dc45babf43070d519011dfc1e33c8875 (diff) | |
| download | linux-62080509734f654c26f811c4e8e93fa357826661.tar.xz | |
Merge tag 'ffa-update-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/drivers
Arm FF-A update for v6.9
Another single and simple update to just constify the ffa_bus_type
structure similar to other changes done treewide following the driver
core changes to accomodate the same.
* tag 'ffa-update-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
firmware: arm_ffa: Make ffa_bus_type const
Link: https://lore.kernel.org/r/20240223033250.117878-1-sudeep.holla@arm.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/firmware/arm_ffa/bus.c | 2 | ||||
| -rw-r--r-- | include/linux/arm_ffa.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/arm_ffa/bus.c b/drivers/firmware/arm_ffa/bus.c index 1c7940ba5539..2f557e90f2eb 100644 --- a/drivers/firmware/arm_ffa/bus.c +++ b/drivers/firmware/arm_ffa/bus.c @@ -105,7 +105,7 @@ static struct attribute *ffa_device_attributes_attrs[] = { }; ATTRIBUTE_GROUPS(ffa_device_attributes); -struct bus_type ffa_bus_type = { +const struct bus_type ffa_bus_type = { .name = "arm_ffa", .match = ffa_device_match, .probe = ffa_device_probe, diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 3d0fde57ba90..c906f666ff5d 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -209,7 +209,7 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev) { return false; } #define module_ffa_driver(__ffa_driver) \ module_driver(__ffa_driver, ffa_register, ffa_unregister) -extern struct bus_type ffa_bus_type; +extern const struct bus_type ffa_bus_type; /* FFA transport related */ struct ffa_partition_info { |