Skip to content

Commit 6208050

Browse files
committed
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>
2 parents d22ee15 + 989e866 commit 6208050

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/firmware/arm_ffa/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static struct attribute *ffa_device_attributes_attrs[] = {
105105
};
106106
ATTRIBUTE_GROUPS(ffa_device_attributes);
107107

108-
struct bus_type ffa_bus_type = {
108+
const struct bus_type ffa_bus_type = {
109109
.name = "arm_ffa",
110110
.match = ffa_device_match,
111111
.probe = ffa_device_probe,

include/linux/arm_ffa.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev) { return false; }
209209
#define module_ffa_driver(__ffa_driver) \
210210
module_driver(__ffa_driver, ffa_register, ffa_unregister)
211211

212-
extern struct bus_type ffa_bus_type;
212+
extern const struct bus_type ffa_bus_type;
213213

214214
/* FFA transport related */
215215
struct ffa_partition_info {

0 commit comments

Comments
 (0)