diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-05-14 12:12:10 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-14 12:34:46 -0400 |
commit | 0f65402b2593cae129dcdb67f6ad79d5dc2ac017 (patch) | |
tree | f5b60462d6f5b319c5495b44e3d420b1f7b50287 | |
parent | be15411d97b6b9b2883b7f1ec52ef03bc770a6d4 (diff) |
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>
-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) | |||
76 | return (MAX8649_DCDC_VMIN + index * MAX8649_DCDC_STEP); | 76 | return (MAX8649_DCDC_VMIN + index * MAX8649_DCDC_STEP); |
77 | } | 77 | } |
78 | 78 | ||
79 | static int max8649_get_voltage(struct regulator_dev *rdev) | 79 | static int max8649_get_voltage_sel(struct regulator_dev *rdev) |
80 | { | 80 | { |
81 | struct max8649_regulator_info *info = rdev_get_drvdata(rdev); | 81 | struct max8649_regulator_info *info = rdev_get_drvdata(rdev); |
82 | unsigned int val; | 82 | unsigned int val; |
@@ -87,7 +87,7 @@ static int max8649_get_voltage(struct regulator_dev *rdev) | |||
87 | if (ret != 0) | 87 | if (ret != 0) |
88 | return ret; | 88 | return ret; |
89 | data = (unsigned char)val & MAX8649_VOL_MASK; | 89 | data = (unsigned char)val & MAX8649_VOL_MASK; |
90 | return max8649_list_voltage(rdev, data); | 90 | return data; |
91 | } | 91 | } |
92 | 92 | ||
93 | static int max8649_set_voltage(struct regulator_dev *rdev, | 93 | static int max8649_set_voltage(struct regulator_dev *rdev, |
@@ -196,7 +196,7 @@ static unsigned int max8649_get_mode(struct regulator_dev *rdev) | |||
196 | 196 | ||
197 | static struct regulator_ops max8649_dcdc_ops = { | 197 | static struct regulator_ops max8649_dcdc_ops = { |
198 | .set_voltage = max8649_set_voltage, | 198 | .set_voltage = max8649_set_voltage, |
199 | .get_voltage = max8649_get_voltage, | 199 | .get_voltage_sel = max8649_get_voltage_sel, |
200 | .list_voltage = max8649_list_voltage, | 200 | .list_voltage = max8649_list_voltage, |
201 | .enable = max8649_enable, | 201 | .enable = max8649_enable, |
202 | .disable = max8649_disable, | 202 | .disable = max8649_disable, |