summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2018-03-15 13:13:41 -0500
committerSekhar Nori <nsekhar@ti.com>2018-03-29 12:19:12 +0530
commitf6adc9fd1ff9bbe766cbb68e84a0d97f54a4f436 (patch)
tree07817c279406e9e75fbb3e301f4e7a4866a1157e
parent3424a516d9d2d3fa45c63750c15ea2bba893ea81 (diff)
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. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/mach-davinci/devices-da8xx.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 24422ba07cc7..78390c64e6ca 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -1106,11 +1106,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,