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

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

regulator: wm8400: Use wm8400_ldo_list_voltage instead of open code to verify selected voltage 



Call wm8400_ldo_list_voltage() instead of open code to verify selected voltage
falls within specified range.
Use wm8400_ldo_list_voltage() here is less error prone.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3fe3a182

drivers/regulator/wm8400-regulator.c

+7 −15
Original line number Diff line number Diff line
@@ -35,27 +35,19 @@ static int wm8400_ldo_map_voltage(struct regulator_dev *dev, 
				  int min_uV, int max_uV)

{

	u16 val;

	int volt;



	if (min_uV < 900000 || min_uV > 3300000)

		return -EINVAL;



	if (min_uV < 1700000) {

		/* Steps of 50mV from 900mV;  */

	if (min_uV < 1700000) /* Steps of 50mV from 900mV;  */

		val = DIV_ROUND_UP(min_uV - 900000, 50000);

	else /* Steps of 100mV from 1700mV */

		val = DIV_ROUND_UP(min_uV - 1700000, 100000) + 15;



		if ((val * 50000) + 900000 > max_uV)

	volt = wm8400_ldo_list_voltage(dev, val);

	if (volt < min_uV || volt > max_uV)

		return -EINVAL;

		BUG_ON((val * 50000) + 900000 < min_uV);

	} else {

		/* Steps of 100mV from 1700mV */

		val = DIV_ROUND_UP(min_uV - 1700000, 100000);



		if ((val * 100000) + 1700000 > max_uV)

			return -EINVAL;

		BUG_ON((val * 100000) + 1700000 < min_uV);



		val += 0xf;

	}



	return val;

}