aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-05-16 20:55:45 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-17 18:00:56 -0400
commit68c7ff8f9b40bcc35abb22160bc30221477e0a89 (patch)
treee0cdcb5d8583705c01f5503616d113afdadc5fb3 /drivers/regulator
parent0cbd6702186af44ca14d68d3fd3f3368287f4ee4 (diff)
regulator: max8925: Remove check_range function and max_uV from struct rc5t583_regulator_info
This driver has been converted to use regulator_map_voltage_linear and set_voltage_sel now. regulator_map_voltage_linear will check the the voltage falls within specified range. The check_range() function and max_uV field are not used now, remove them. 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.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 0ffcb5555285..43dc97ec3932 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -38,20 +38,10 @@ struct max8925_regulator_info {
38 struct i2c_client *i2c; 38 struct i2c_client *i2c;
39 struct max8925_chip *chip; 39 struct max8925_chip *chip;
40 40
41 int max_uV;
42 int vol_reg; 41 int vol_reg;
43 int enable_reg; 42 int enable_reg;
44}; 43};
45 44
46static inline int check_range(struct max8925_regulator_info *info,
47 int min_uV, int max_uV)
48{
49 if (min_uV < info->desc.min_uV || min_uV > info->max_uV)
50 return -EINVAL;
51
52 return 0;
53}
54
55static int max8925_set_voltage_sel(struct regulator_dev *rdev, 45static int max8925_set_voltage_sel(struct regulator_dev *rdev,
56 unsigned int selector) 46 unsigned int selector)
57{ 47{
@@ -177,7 +167,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = {
177 .min_uV = min * 1000, \ 167 .min_uV = min * 1000, \
178 .uV_step = step * 1000, \ 168 .uV_step = step * 1000, \
179 }, \ 169 }, \
180 .max_uV = max * 1000, \
181 .vol_reg = MAX8925_SDV##_id, \ 170 .vol_reg = MAX8925_SDV##_id, \
182 .enable_reg = MAX8925_SDCTL##_id, \ 171 .enable_reg = MAX8925_SDCTL##_id, \
183} 172}
@@ -194,7 +183,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = {
194 .min_uV = min * 1000, \ 183 .min_uV = min * 1000, \
195 .uV_step = step * 1000, \ 184 .uV_step = step * 1000, \
196 }, \ 185 }, \
197 .max_uV = max * 1000, \
198 .vol_reg = MAX8925_LDOVOUT##_id, \ 186 .vol_reg = MAX8925_LDOVOUT##_id, \
199 .enable_reg = MAX8925_LDOCTL##_id, \ 187 .enable_reg = MAX8925_LDOCTL##_id, \
200} 188}