Skip to contentSkip to conversation

ARM: davinci: DA8XX: simplify CFGCHIP regmap_config

PATCH Applied David Lechner 2 participants 2 messages Mar 15, 2018 – Mar 16, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: davinci: DA8XX: simplify CFGCHIP regmap_config

Since commit 8253bb3f8255 ("regmap: potentially duplicate the name string stored in regmap"), the name field of struct regmap_config is copied in __regmap_init(), so we no longer need to worry about keeping our own copy of the name.

Just use a string literal in the initialization of da8xx_cfgchip_config instead of creating a separate variable for the name.

---
 arch/arm/mach-davinci/devices-da8xx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-davinci/devices-da8xx.c +1 -4
index 273b6c2..1fd3619 100644
@@ -1095,11 +1095,8 @@ int __init da850_register_sata(unsigned long refclkpn)
 
 static struct regmap *da8xx_cfgchip;
 
-/* regmap doesn't make a copy of this, so we need to keep the pointer around */
-static const char da8xx_cfgchip_name[] = "cfgchip";
-
 static const struct regmap_config da8xx_cfgchip_config __initconst = {
-	.name		= da8xx_cfgchip_name,
+	.name		= "cfgchip",
 	.reg_bits	= 32,
 	.val_bits	= 32,
 	.reg_stride	= 4,
Signature · 1 line
2.7.4
Applied
#1 lore raw
Quoted 9 lines · David Lechner

Since commit 8253bb3f8255 ("regmap: potentially duplicate the name string stored in regmap"), the name field of struct regmap_config is copied in __regmap_init(), so we no longer need to worry about keeping our own copy of the name.

Just use a string literal in the initialization of da8xx_cfgchip_config instead of creating a separate variable for the name.

Applied to v4.17/soc of my tree.

Thanks,
Sekhar