regulator: core: Add back the const qualifier for ops of struct regulator_desc
authorAxel Lin <axel.lin@ingics.com>
Thu, 21 Aug 2014 02:11:34 +0000 (10:11 +0800)
committerMark Brown <broonie@linaro.org>
Thu, 21 Aug 2014 14:49:08 +0000 (09:49 -0500)
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>
include/linux/regulator/driver.h

index 3abda7554d8287e21a8631307ff6dc86c098aad9..efe058f8f746fc5ec3fd7ba193391ee529a574a6 100644 (file)
@@ -246,7 +246,7 @@ struct regulator_desc {
        int id;
        bool continuous_voltage_range;
        unsigned n_voltages;
-       struct regulator_ops *ops;
+       const struct regulator_ops *ops;
        int irq;
        enum regulator_type type;
        struct module *owner;