diff options
-rw-r--r-- | drivers/regulator/mc13892-regulator.c | 1 | ||||
-rw-r--r-- | drivers/regulator/mc13xxx-regulator-core.c | 6 | ||||
-rw-r--r-- | drivers/regulator/mc13xxx.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index 6329723b5372..b388b746452e 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c | |||
@@ -469,7 +469,6 @@ err: | |||
469 | } | 469 | } |
470 | 470 | ||
471 | static struct regulator_ops mc13892_sw_regulator_ops = { | 471 | static struct regulator_ops mc13892_sw_regulator_ops = { |
472 | .is_enabled = mc13xxx_sw_regulator_is_enabled, | ||
473 | .list_voltage = regulator_list_voltage_table, | 472 | .list_voltage = regulator_list_voltage_table, |
474 | .set_voltage_sel = mc13892_sw_regulator_set_voltage_sel, | 473 | .set_voltage_sel = mc13892_sw_regulator_set_voltage_sel, |
475 | .get_voltage = mc13892_sw_regulator_get_voltage, | 474 | .get_voltage = mc13892_sw_regulator_get_voltage, |
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c index 8a6b050ff5aa..d6eda28ca5d0 100644 --- a/drivers/regulator/mc13xxx-regulator-core.c +++ b/drivers/regulator/mc13xxx-regulator-core.c | |||
@@ -170,12 +170,6 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = { | |||
170 | }; | 170 | }; |
171 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops); | 171 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops); |
172 | 172 | ||
173 | int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev) | ||
174 | { | ||
175 | return 1; | ||
176 | } | ||
177 | EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled); | ||
178 | |||
179 | #ifdef CONFIG_OF | 173 | #ifdef CONFIG_OF |
180 | int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev) | 174 | int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev) |
181 | { | 175 | { |
diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h index 9a8f72ce718e..8343a25888d2 100644 --- a/drivers/regulator/mc13xxx.h +++ b/drivers/regulator/mc13xxx.h | |||
@@ -33,7 +33,6 @@ struct mc13xxx_regulator_priv { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | extern int mc13xxx_sw_regulator(struct regulator_dev *rdev); | 35 | extern int mc13xxx_sw_regulator(struct regulator_dev *rdev); |
36 | extern int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev); | ||
37 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, | 36 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, |
38 | int min_uV, int max_uV, unsigned *selector); | 37 | int min_uV, int max_uV, unsigned *selector); |
39 | extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev); | 38 | extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev); |