diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-05-14 18:12:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-14 18:34:46 +0200 |
| commit | 0f65402b2593cae129dcdb67f6ad79d5dc2ac017 (patch) | |
| tree | f5b60462d6f5b319c5495b44e3d420b1f7b50287 /drivers/regulator | |
| parent | regulator: tps62360: Fix build error due to missing semicolon (diff) | |
| download | linux-0f65402b2593cae129dcdb67f6ad79d5dc2ac017.tar.xz linux-0f65402b2593cae129dcdb67f6ad79d5dc2ac017.zip | |
regulator: max8649: Convert to get_voltage_sel
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/max8649.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 4ce72081c2e3..3b73a7f4aed1 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c @@ -76,7 +76,7 @@ static int max8649_list_voltage(struct regulator_dev *rdev, unsigned index) return (MAX8649_DCDC_VMIN + index * MAX8649_DCDC_STEP); } -static int max8649_get_voltage(struct regulator_dev *rdev) +static int max8649_get_voltage_sel(struct regulator_dev *rdev) { struct max8649_regulator_info *info = rdev_get_drvdata(rdev); unsigned int val; @@ -87,7 +87,7 @@ static int max8649_get_voltage(struct regulator_dev *rdev) if (ret != 0) return ret; data = (unsigned char)val & MAX8649_VOL_MASK; - return max8649_list_voltage(rdev, data); + return data; } static int max8649_set_voltage(struct regulator_dev *rdev, @@ -196,7 +196,7 @@ static unsigned int max8649_get_mode(struct regulator_dev *rdev) static struct regulator_ops max8649_dcdc_ops = { .set_voltage = max8649_set_voltage, - .get_voltage = max8649_get_voltage, + .get_voltage_sel = max8649_get_voltage_sel, .list_voltage = max8649_list_voltage, .enable = max8649_enable, .disable = max8649_disable, |