aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-08-20 22:11:34 -0400
committerMark Brown <broonie@linaro.org>2014-08-21 10:49:08 -0400
commitdf11e506d330d9a0e5a701cd2c5fcb7d461b6060 (patch)
tree19c21f5e9d1ec07206592a2b9df539dd47aa4da9
parent39f5460d7f9cc57d3dd745301bf60ca5d65a6e7b (diff)
regulator: core: Add back the const qualifier for ops of struct regulator_desc
Fix below build warning: CC [M] drivers/regulator/hi6421-regulator.o drivers/regulator/hi6421-regulator.c:356:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] This is a revert of commit 716845ebeb50 ("regulator: core: Fix build error due to const qualifier for ops"). The build error was fixed by commit 39f5460d7f9c ("regulator: core: add const to regulator_ops and fix build error in mc13892"). Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--include/linux/regulator/driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 3abda7554d82..efe058f8f746 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -246,7 +246,7 @@ struct regulator_desc {
246 int id; 246 int id;
247 bool continuous_voltage_range; 247 bool continuous_voltage_range;
248 unsigned n_voltages; 248 unsigned n_voltages;
249 struct regulator_ops *ops; 249 const struct regulator_ops *ops;
250 int irq; 250 int irq;
251 enum regulator_type type; 251 enum regulator_type type;
252 struct module *owner; 252 struct module *owner;