Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae713d39 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Convert ab8500 to set_voltage_sel 



Convert ab8500 to set_voltage_sel and then we can remove
ab8500_get_best_voltage_index function.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8300d2fd

drivers/regulator/ab8500.c

+4 −31
Original line number Diff line number Diff line
@@ -234,25 +234,8 @@ static int ab8500_regulator_get_voltage_sel(struct regulator_dev *rdev) 
		return val;

}



static int ab8500_get_best_voltage_index(struct regulator_dev *rdev,

		int min_uV, int max_uV)

{

	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);

	int i;



	/* check the supported voltage */

	for (i = 0; i < info->voltages_len; i++) {

		if ((info->voltages[i] >= min_uV) &&

		    (info->voltages[i] <= max_uV))

			return i;

	}



	return -EINVAL;

}



static int ab8500_regulator_set_voltage(struct regulator_dev *rdev,

					int min_uV, int max_uV,

					unsigned *selector)

static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev,

					    unsigned selector)

{

	int ret;

	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
@@ -263,18 +246,8 @@ static int ab8500_regulator_set_voltage(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	/* get the appropriate voltages within the range */

	ret = ab8500_get_best_voltage_index(rdev, min_uV, max_uV);

	if (ret < 0) {

		dev_err(rdev_get_dev(rdev),

				"couldn't get best voltage for regulator\n");

		return ret;

	}



	*selector = ret;



	/* set the registers for the request */

	regval = (u8)ret;

	regval = (u8)selector;

	ret = abx500_mask_and_set_register_interruptible(info->dev,

			info->voltage_bank, info->voltage_reg,

			info->voltage_mask, regval);
@@ -319,7 +292,7 @@ static struct regulator_ops ab8500_regulator_ops = { 
	.disable	= ab8500_regulator_disable,

	.is_enabled	= ab8500_regulator_is_enabled,

	.get_voltage_sel = ab8500_regulator_get_voltage_sel,

	.set_voltage	= ab8500_regulator_set_voltage,

	.set_voltage_sel = ab8500_regulator_set_voltage_sel,

	.list_voltage	= ab8500_list_voltage,

	.enable_time	= ab8500_regulator_enable_time,

	.set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,