regulator: Convert WM8994 to use get_voltage_sel()
PATCH 1/1 regulator: Convert WM8994 to use get_voltage_sel()
Signed-off-by Mark Brown <[email protected]>
--- drivers/regulator/wm8994-regulator.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)
drivers/regulator/wm8994-regulator.c +6 -10
@@ -86,7 +86,7 @@ static int wm8994_ldo1_list_voltage(struct regulator_dev *rdev,return (selector *100000 ) +2400000 ; } -static int wm8994_ldo1_get_voltage (struct regulator_dev *rdev) +static int wm8994_ldo1_get_voltage_sel (struct regulator_dev *rdev) {struct wm8994_ldo *ldo =rdev_get_drvdata (rdev);int val;
@@ -95,9 +95,7 @@ static int wm8994_ldo1_get_voltage(struct regulator_dev *rdev)if (val <0 )return val; - val = (val &WM8994_LDO1_VSEL_MASK ) >>WM8994_LDO1_VSEL_SHIFT ; - -return wm8994_ldo1_list_voltage (rdev, val); +return (val &WM8994_LDO1_VSEL_MASK ) >>WM8994_LDO1_VSEL_SHIFT ; } static int wm8994_ldo1_set_voltage(struct regulator_dev *rdev,
@@ -125,7 +123,7 @@ static struct regulator_ops wm8994_ldo1_ops = { .enable_time = wm8994_ldo_enable_time, .list_voltage = wm8994_ldo1_list_voltage, - .get_voltage = wm8994_ldo1_get_voltage, + .get_voltage_sel = wm8994_ldo1_get_voltage_sel, .set_voltage = wm8994_ldo1_set_voltage, };
@@ -138,7 +136,7 @@ static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,return (selector *100000 ) +900000 ; } -static int wm8994_ldo2_get_voltage (struct regulator_dev *rdev) +static int wm8994_ldo2_get_voltage_sel (struct regulator_dev *rdev) {struct wm8994_ldo *ldo =rdev_get_drvdata (rdev);int val;
@@ -147,9 +145,7 @@ static int wm8994_ldo2_get_voltage(struct regulator_dev *rdev)if (val <0 )return val; - val = (val &WM8994_LDO2_VSEL_MASK ) >>WM8994_LDO2_VSEL_SHIFT ; - -return wm8994_ldo2_list_voltage (rdev, val); +return (val &WM8994_LDO2_VSEL_MASK ) >>WM8994_LDO2_VSEL_SHIFT ; } static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
@@ -177,7 +173,7 @@ static struct regulator_ops wm8994_ldo2_ops = { .enable_time = wm8994_ldo_enable_time, .list_voltage = wm8994_ldo2_list_voltage, - .get_voltage = wm8994_ldo2_get_voltage, + .get_voltage_sel = wm8994_ldo2_get_voltage_sel, .set_voltage = wm8994_ldo2_set_voltage, };
Signature · 1 line
1.7.1
Liam Girdwood
AppliedQuoted 5 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- drivers/regulator/wm8994-regulator.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)
Applied.
Thanks
Liam
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk