diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-05-14 10:34:50 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-14 11:00:39 +0100 |
| commit | 3c8983b9ac2f8bf9f23effa4f72ce814f8375397 (patch) | |
| tree | 2e05a14e65e0cabd70e58c0fc3c38541b17995cd /drivers/regulator | |
| parent | e81dba85c6388dfabcb76cbc2b8bd02836a53ae5 (diff) | |
| download | talos-op-linux-3c8983b9ac2f8bf9f23effa4f72ce814f8375397.tar.gz talos-op-linux-3c8983b9ac2f8bf9f23effa4f72ce814f8375397.zip | |
regulator: max8925: 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/max8925-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index de30ea2b80f5..529ee4152f11 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c @@ -78,7 +78,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev, return max8925_set_bits(info->i2c, info->vol_reg, mask, data); } -static int max8925_get_voltage(struct regulator_dev *rdev) +static int max8925_get_voltage_sel(struct regulator_dev *rdev) { struct max8925_regulator_info *info = rdev_get_drvdata(rdev); unsigned char data, mask; @@ -90,7 +90,7 @@ static int max8925_get_voltage(struct regulator_dev *rdev) mask = rdev->desc->n_voltages - 1; data = ret & mask; - return max8925_list_voltage(rdev, data); + return data; } static int max8925_enable(struct regulator_dev *rdev) @@ -162,7 +162,7 @@ static int max8925_set_dvm_disable(struct regulator_dev *rdev) static struct regulator_ops max8925_regulator_sdv_ops = { .list_voltage = max8925_list_voltage, .set_voltage = max8925_set_voltage, - .get_voltage = max8925_get_voltage, + .get_voltage_sel = max8925_get_voltage_sel, .enable = max8925_enable, .disable = max8925_disable, .is_enabled = max8925_is_enabled, @@ -174,7 +174,7 @@ static struct regulator_ops max8925_regulator_sdv_ops = { static struct regulator_ops max8925_regulator_ldo_ops = { .list_voltage = max8925_list_voltage, .set_voltage = max8925_set_voltage, - .get_voltage = max8925_get_voltage, + .get_voltage_sel = max8925_get_voltage_sel, .enable = max8925_enable, .disable = max8925_disable, .is_enabled = max8925_is_enabled, |
