mfd: syscon: Make syscon_regmap_config const
authorPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 29 Jan 2016 09:30:16 +0000 (10:30 +0100)
committerLee Jones <lee.jones@linaro.org>
Wed, 16 Mar 2016 08:50:18 +0000 (08:50 +0000)
syscon_regmap_config can be made const if syscon_probe() creates a local
copy on the stack, just like syscon_register() does.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/syscon.c

index 99e8f88e68487f1a4788e601e6599778e4feed73..2f2225e845efe960a9904fefc1d16fc5cde6b081 100644 (file)
@@ -36,7 +36,7 @@ struct syscon {
        struct list_head list;
 };
 
-static struct regmap_config syscon_regmap_config = {
+static const struct regmap_config syscon_regmap_config = {
        .reg_bits = 32,
        .val_bits = 32,
        .reg_stride = 4,
@@ -199,6 +199,7 @@ static int syscon_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct syscon_platform_data *pdata = dev_get_platdata(dev);
        struct syscon *syscon;
+       struct regmap_config syscon_config = syscon_regmap_config;
        struct resource *res;
        void __iomem *base;
 
@@ -214,11 +215,10 @@ static int syscon_probe(struct platform_device *pdev)
        if (!base)
                return -ENOMEM;
 
-       syscon_regmap_config.max_register = res->end - res->start - 3;
+       syscon_config.max_register = res->end - res->start - 3;
        if (pdata)
-               syscon_regmap_config.name = pdata->label;
-       syscon->regmap = devm_regmap_init_mmio(dev, base,
-                                       &syscon_regmap_config);
+               syscon_config.name = pdata->label;
+       syscon->regmap = devm_regmap_init_mmio(dev, base, &syscon_config);
        if (IS_ERR(syscon->regmap)) {
                dev_err(dev, "regmap init failed\n");
                return PTR_ERR(syscon->regmap);