evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: max8925: Convert to get_voltage_sel

Browse source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-05-14 10:34:50 +08:00 • committed by Mark Brown
parent e81dba85c6
commit 3c8983b9ac
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/regulator/max8925-regulator.c
View file

@ -78,7 +78,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev,
return max8925_set_bits(info->i2c, info->vol_reg, mask, data); 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); struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
unsigned char data, mask; unsigned char data, mask;
@ -90,7 +90,7 @@ static int max8925_get_voltage(struct regulator_dev *rdev)
mask = rdev->desc->n_voltages - 1; mask = rdev->desc->n_voltages - 1;
data = ret & mask; data = ret & mask;
return max8925_list_voltage(rdev, data); return data;
} }
static int max8925_enable(struct regulator_dev *rdev) 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 = { static struct regulator_ops max8925_regulator_sdv_ops = {
.list_voltage = max8925_list_voltage, .list_voltage = max8925_list_voltage,
.set_voltage = max8925_set_voltage, .set_voltage = max8925_set_voltage,
.get_voltage = max8925_get_voltage, .get_voltage_sel = max8925_get_voltage_sel,
.enable = max8925_enable, .enable = max8925_enable,
.disable = max8925_disable, .disable = max8925_disable,
.is_enabled = max8925_is_enabled, .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 = { static struct regulator_ops max8925_regulator_ldo_ops = {
.list_voltage = max8925_list_voltage, .list_voltage = max8925_list_voltage,
.set_voltage = max8925_set_voltage, .set_voltage = max8925_set_voltage,
.get_voltage = max8925_get_voltage, .get_voltage_sel = max8925_get_voltage_sel,
.enable = max8925_enable, .enable = max8925_enable,
.disable = max8925_disable, .disable = max8925_disable,
.is_enabled = max8925_is_enabled, .is_enabled = max8925_is_enabled,