diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2016-01-29 04:30:16 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-03-16 04:50:18 -0400 |
commit | c131045d5b074bcb749421c4b3f11f0655bdc0b6 (patch) | |
tree | 6d491cf37c414bc77415b5532e1e058491748bda | |
parent | ca668f0edfae65438c3f0a3ad5d3e59e3515915f (diff) |
mfd: syscon: Make syscon_regmap_config const
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>
-rw-r--r-- | drivers/mfd/syscon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 99e8f88e6848..2f2225e845ef 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c | |||
@@ -36,7 +36,7 @@ struct syscon { | |||
36 | struct list_head list; | 36 | struct list_head list; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | static struct regmap_config syscon_regmap_config = { | 39 | static const struct regmap_config syscon_regmap_config = { |
40 | .reg_bits = 32, | 40 | .reg_bits = 32, |
41 | .val_bits = 32, | 41 | .val_bits = 32, |
42 | .reg_stride = 4, | 42 | .reg_stride = 4, |
@@ -199,6 +199,7 @@ static int syscon_probe(struct platform_device *pdev) | |||
199 | struct device *dev = &pdev->dev; | 199 | struct device *dev = &pdev->dev; |
200 | struct syscon_platform_data *pdata = dev_get_platdata(dev); | 200 | struct syscon_platform_data *pdata = dev_get_platdata(dev); |
201 | struct syscon *syscon; | 201 | struct syscon *syscon; |
202 | struct regmap_config syscon_config = syscon_regmap_config; | ||
202 | struct resource *res; | 203 | struct resource *res; |
203 | void __iomem *base; | 204 | void __iomem *base; |
204 | 205 | ||
@@ -214,11 +215,10 @@ static int syscon_probe(struct platform_device *pdev) | |||
214 | if (!base) | 215 | if (!base) |
215 | return -ENOMEM; | 216 | return -ENOMEM; |
216 | 217 | ||
217 | syscon_regmap_config.max_register = res->end - res->start - 3; | 218 | syscon_config.max_register = res->end - res->start - 3; |
218 | if (pdata) | 219 | if (pdata) |
219 | syscon_regmap_config.name = pdata->label; | 220 | syscon_config.name = pdata->label; |
220 | syscon->regmap = devm_regmap_init_mmio(dev, base, | 221 | syscon->regmap = devm_regmap_init_mmio(dev, base, &syscon_config); |
221 | &syscon_regmap_config); | ||
222 | if (IS_ERR(syscon->regmap)) { | 222 | if (IS_ERR(syscon->regmap)) { |
223 | dev_err(dev, "regmap init failed\n"); | 223 | dev_err(dev, "regmap init failed\n"); |
224 | return PTR_ERR(syscon->regmap); | 224 | return PTR_ERR(syscon->regmap); |