diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-08-09 21:38:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-28 14:00:27 -0400 |
| commit | b571dc38d447fb34db39496b8a236946ff9baf34 (patch) | |
| tree | af9d2b8bf319a8c28b9bf38faae7d6d000d1a6df /drivers/regulator | |
| parent | 89009e1888ad9a7f4491b8644884f5339773e643 (diff) | |
regulator: mc13xxx: Remove get_voltage implementation for single voltage regulators
This is not required after commit f7df20ec
"regulator: core: Use list_voltage() to read single voltage regulators"
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/mc13783-regulator.c | 1 | ||||
| -rw-r--r-- | drivers/regulator/mc13892-regulator.c | 1 | ||||
| -rw-r--r-- | drivers/regulator/mc13xxx-regulator-core.c | 11 | ||||
| -rw-r--r-- | drivers/regulator/mc13xxx.h | 1 |
4 files changed, 0 insertions, 14 deletions
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index 2587ea1f7438..4977b199c86b 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c | |||
| @@ -324,7 +324,6 @@ static struct regulator_ops mc13783_gpo_regulator_ops = { | |||
| 324 | .is_enabled = mc13783_gpo_regulator_is_enabled, | 324 | .is_enabled = mc13783_gpo_regulator_is_enabled, |
| 325 | .list_voltage = regulator_list_voltage_table, | 325 | .list_voltage = regulator_list_voltage_table, |
| 326 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, | 326 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, |
| 327 | .get_voltage = mc13xxx_fixed_regulator_get_voltage, | ||
| 328 | }; | 327 | }; |
| 329 | 328 | ||
| 330 | static int __devinit mc13783_regulator_probe(struct platform_device *pdev) | 329 | static int __devinit mc13783_regulator_probe(struct platform_device *pdev) |
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index 09265f02ed37..1fa63812f7ac 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c | |||
| @@ -390,7 +390,6 @@ static struct regulator_ops mc13892_gpo_regulator_ops = { | |||
| 390 | .is_enabled = mc13892_gpo_regulator_is_enabled, | 390 | .is_enabled = mc13892_gpo_regulator_is_enabled, |
| 391 | .list_voltage = regulator_list_voltage_table, | 391 | .list_voltage = regulator_list_voltage_table, |
| 392 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, | 392 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, |
| 393 | .get_voltage = mc13xxx_fixed_regulator_get_voltage, | ||
| 394 | }; | 393 | }; |
| 395 | 394 | ||
| 396 | static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev) | 395 | static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev) |
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c index 8151889745e6..88cbb832d555 100644 --- a/drivers/regulator/mc13xxx-regulator-core.c +++ b/drivers/regulator/mc13xxx-regulator-core.c | |||
| @@ -152,23 +152,12 @@ int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV, | |||
| 152 | } | 152 | } |
| 153 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage); | 153 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage); |
| 154 | 154 | ||
| 155 | int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev) | ||
| 156 | { | ||
| 157 | int id = rdev_get_id(rdev); | ||
| 158 | |||
| 159 | dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); | ||
| 160 | |||
| 161 | return rdev->desc->volt_table[0]; | ||
| 162 | } | ||
| 163 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_get_voltage); | ||
| 164 | |||
| 165 | struct regulator_ops mc13xxx_fixed_regulator_ops = { | 155 | struct regulator_ops mc13xxx_fixed_regulator_ops = { |
| 166 | .enable = mc13xxx_regulator_enable, | 156 | .enable = mc13xxx_regulator_enable, |
| 167 | .disable = mc13xxx_regulator_disable, | 157 | .disable = mc13xxx_regulator_disable, |
| 168 | .is_enabled = mc13xxx_regulator_is_enabled, | 158 | .is_enabled = mc13xxx_regulator_is_enabled, |
| 169 | .list_voltage = regulator_list_voltage_table, | 159 | .list_voltage = regulator_list_voltage_table, |
| 170 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, | 160 | .set_voltage = mc13xxx_fixed_regulator_set_voltage, |
| 171 | .get_voltage = mc13xxx_fixed_regulator_get_voltage, | ||
| 172 | }; | 161 | }; |
| 173 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops); | 162 | EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops); |
| 174 | 163 | ||
diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h index eaff5510b6df..06c8903f182a 100644 --- a/drivers/regulator/mc13xxx.h +++ b/drivers/regulator/mc13xxx.h | |||
| @@ -34,7 +34,6 @@ struct mc13xxx_regulator_priv { | |||
| 34 | 34 | ||
| 35 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, | 35 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, |
| 36 | int min_uV, int max_uV, unsigned *selector); | 36 | int min_uV, int max_uV, unsigned *selector); |
| 37 | extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev); | ||
| 38 | 37 | ||
| 39 | #ifdef CONFIG_OF | 38 | #ifdef CONFIG_OF |
| 40 | extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev); | 39 | extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev); |
