Skip to content

Commit 77dc111

Browse files
committed
Merge tag 'sunxi-drivers-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers
Allwinner SoC driver changes for 6.11 part 2 One additional minor cleanup - Const-ify |struct regmap_config| in SRAM driver - Const-ify |struct regmap_bus| in Allwinner RSB bus driver * tag 'sunxi-drivers-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: bus: sunxi-rsb: Constify struct regmap_bus soc: sunxi: sram: Constify struct regmap_config Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8cfda40 + e4b5a39 commit 77dc111

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/bus/sunxi-rsb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static void regmap_sunxi_rsb_free_ctx(void *context)
457457
kfree(ctx);
458458
}
459459

460-
static struct regmap_bus regmap_sunxi_rsb = {
460+
static const struct regmap_bus regmap_sunxi_rsb = {
461461
.reg_write = regmap_sunxi_rsb_reg_write,
462462
.reg_read = regmap_sunxi_rsb_reg_read,
463463
.free_context = regmap_sunxi_rsb_free_ctx,

drivers/soc/sunxi/sunxi_sram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ static void sunxi_sram_unlock(void *_lock)
344344
spin_unlock(lock);
345345
}
346346

347-
static struct regmap_config sunxi_sram_regmap_config = {
347+
static const struct regmap_config sunxi_sram_regmap_config = {
348348
.reg_bits = 32,
349349
.val_bits = 32,
350350
.reg_stride = 4,

0 commit comments

Comments
 (0)