regulator: Convert ab3100 to set_voltage_sel
PATCH 1/1 regulator: Convert ab3100 to set_voltage_sel
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/ab3100.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
drivers/regulator/ab3100.c +5 -13
@@ -338,20 +338,12 @@ static int ab3100_get_best_voltage_index(struct regulator_dev *reg,return bestindex; } -static int ab3100_set_voltage_regulator (struct regulator_dev *reg, -int min_uV,int max_uV, -unsigned *selector) +static int ab3100_set_voltage_regulator_sel (struct regulator_dev *reg, +unsigned selector) {struct ab3100_regulator *abreg = reg->reg_data;u8 regval;int err; -int bestindex; - - bestindex =ab3100_get_best_voltage_index (reg, min_uV, max_uV); -if (bestindex <0 ) -return bestindex; - - *selector = bestindex; err =abx500_get_register_interruptible (abreg->dev,0 , abreg->regreg, ®val);
@@ -364,7 +356,7 @@ static int ab3100_set_voltage_regulator(struct regulator_dev *reg,/* The highest three bits control the variable regulators */ regval &= ~0xE0 ; - regval |= (bestindex <<5 ); + regval |= (selector <<5 ); err =abx500_set_register_interruptible (abreg->dev,0 , abreg->regreg, regval);
@@ -464,7 +456,7 @@ static struct regulator_ops regulator_ops_variable = { .disable = ab3100_disable_regulator, .is_enabled = ab3100_is_enabled_regulator, .get_voltage = ab3100_get_voltage_regulator, - .set_voltage = ab3100_set_voltage_regulator, + .set_voltage_sel = ab3100_set_voltage_regulator_sel, .list_voltage = ab3100_list_voltage_regulator, .enable_time = ab3100_enable_time_regulator, };
@@ -474,7 +466,7 @@ static struct regulator_ops regulator_ops_variable_sleepable = { .disable = ab3100_disable_regulator, .is_enabled = ab3100_is_enabled_regulator, .get_voltage = ab3100_get_voltage_regulator, - .set_voltage = ab3100_set_voltage_regulator, + .set_voltage_sel = ab3100_set_voltage_regulator_sel, .set_suspend_voltage = ab3100_set_suspend_voltage_regulator, .list_voltage = ab3100_list_voltage_regulator, .enable_time = ab3100_enable_time_regulator,
Signature · 1 line
1.7.5.4
Quoted 4 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>---
drivers/regulator/ab3100.c | 18 +++++-------------1 files changed, 5 insertions(+), 13 deletions(-)
Works like a charm.
Tested-by Linus Walleij <[email protected]>
Thanks Axel!
Linus Walleij
Mark Brown
AppliedQuoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Applied, thanks.