aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/anatop-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-21 23:53:18 -0500
committerMark Brown <broonie@linaro.org>2014-03-18 14:35:56 -0400
commit114c5748d540335657fc782cb4d61fb74ae4ac00 (patch)
treeb42e0199762badf13dbf82464c6eda905a8a9ddb /drivers/regulator/anatop-regulator.c
parentd38018f2019c7d01660ca72eab055f79f4547f59 (diff)
regulator: anatop: Remove checking control_reg in [set|get]_voltage_sel
Remove checking control_reg in [set|get]_voltage_sel and then convert to use regulator_[set|get]_voltage_sel_regmap for [set|get]_voltage_sel callbacks. The anatop-reg-offset property is a required property rather than optional property. So the question is what is the meaning of setting anatop-reg-offset to 0? If 0 is a valid setting for anatop-reg-offset and it has special meaning, we had better document it in the binding document. Otherwise, remove the testing for control_reg in the driver. No anatop voltage regulator node in the dts files set anatop-reg-offset to 0. So I think it's safe to remove testing if control_reg is 0. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/anatop-regulator.c')
-rw-r--r--drivers/regulator/anatop-regulator.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 38e8122c4b09..7c397bb81e01 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -55,17 +55,6 @@ struct anatop_regulator {
55 int sel; 55 int sel;
56}; 56};
57 57
58static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,
59 unsigned selector)
60{
61 struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
62
63 if (!anatop_reg->control_reg)
64 return -ENOTSUPP;
65
66 return regulator_set_voltage_sel_regmap(reg, selector);
67}
68
69static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg, 58static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg,
70 unsigned int old_sel, 59 unsigned int old_sel,
71 unsigned int new_sel) 60 unsigned int new_sel)
@@ -92,16 +81,6 @@ static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg,
92 return ret; 81 return ret;
93} 82}
94 83
95static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
96{
97 struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
98
99 if (!anatop_reg->control_reg)
100 return -ENOTSUPP;
101
102 return regulator_get_voltage_sel_regmap(reg);
103}
104
105static int anatop_regmap_enable(struct regulator_dev *reg) 84static int anatop_regmap_enable(struct regulator_dev *reg)
106{ 85{
107 struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); 86 struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
@@ -178,8 +157,8 @@ static int anatop_regmap_set_bypass(struct regulator_dev *reg, bool enable)
178} 157}
179 158
180static struct regulator_ops anatop_rops = { 159static struct regulator_ops anatop_rops = {
181 .set_voltage_sel = anatop_regmap_set_voltage_sel, 160 .set_voltage_sel = regulator_set_voltage_sel_regmap,
182 .get_voltage_sel = anatop_regmap_get_voltage_sel, 161 .get_voltage_sel = regulator_get_voltage_sel_regmap,
183 .list_voltage = regulator_list_voltage_linear, 162 .list_voltage = regulator_list_voltage_linear,
184 .map_voltage = regulator_map_voltage_linear, 163 .map_voltage = regulator_map_voltage_linear,
185}; 164};