From: Axel Lin Date: Thu, 17 May 2012 00:55:45 +0000 (+0800) Subject: regulator: max8925: Remove check_range function and max_uV from struct rc5t583_regula... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68c7ff8f9b40bcc35abb22160bc30221477e0a89;p=linux-beck.git 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 Signed-off-by: Mark Brown --- 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 { struct i2c_client *i2c; struct max8925_chip *chip; - int max_uV; int vol_reg; int enable_reg; }; -static inline int check_range(struct max8925_regulator_info *info, - int min_uV, int max_uV) -{ - if (min_uV < info->desc.min_uV || min_uV > info->max_uV) - return -EINVAL; - - return 0; -} - static int max8925_set_voltage_sel(struct regulator_dev *rdev, unsigned int selector) { @@ -177,7 +167,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = { .min_uV = min * 1000, \ .uV_step = step * 1000, \ }, \ - .max_uV = max * 1000, \ .vol_reg = MAX8925_SDV##_id, \ .enable_reg = MAX8925_SDCTL##_id, \ } @@ -194,7 +183,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = { .min_uV = min * 1000, \ .uV_step = step * 1000, \ }, \ - .max_uV = max * 1000, \ .vol_reg = MAX8925_LDOVOUT##_id, \ .enable_reg = MAX8925_LDOCTL##_id, \ }