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

regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places 



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

drivers/regulator/twl-regulator.c

+6 −24
Original line number Diff line number Diff line
@@ -787,11 +787,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, 
			vsel = 0;

		else if ((min_uV >= 600000) && (min_uV <= 1300000)) {

			int calc_uV;

			vsel = (min_uV - 600000) / 125;

			if (vsel % 100)

				vsel += 100;

			vsel /= 100;

			vsel++;

			vsel = DIV_ROUND_UP(min_uV - 600000, 12500);

			calc_uV = twl6030smps_list_voltage(rdev, vsel);

			if (calc_uV > max_uV)

				return -EINVAL;
@@ -817,11 +813,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, 
			vsel = 0;

		else if ((min_uV >= 700000) && (min_uV <= 1420000)) {

			int calc_uV;

			vsel = (min_uV - 700000) / 125;

			if (vsel % 100)

				vsel += 100;

			vsel /= 100;

			vsel++;

			vsel = DIV_ROUND_UP(min_uV - 700000, 12500);

			calc_uV = twl6030smps_list_voltage(rdev, vsel);

			if (calc_uV > max_uV)

				return -EINVAL;
@@ -845,24 +837,14 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, 
	case SMPS_EXTENDED_EN:

		if (min_uV == 0)

			vsel = 0;

		else if ((min_uV >= 1852000) && (max_uV <= 4013600)) {

			vsel = (min_uV - 1852000) / 386;

			if (vsel % 100)

				vsel += 100;

			vsel /= 100;

			vsel++;

		}

		else if ((min_uV >= 1852000) && (max_uV <= 4013600))

			vsel = DIV_ROUND_UP(min_uV - 1852000, 38600);

		break;

	case SMPS_OFFSET_EN|SMPS_EXTENDED_EN:

		if (min_uV == 0)

			vsel = 0;

		else if ((min_uV >= 2161000) && (max_uV <= 4321000)) {

			vsel = (min_uV - 2161000) / 386;

			if (vsel % 100)

				vsel += 100;

			vsel /= 100;

			vsel++;

		}

		else if ((min_uV >= 2161000) && (max_uV <= 4321000))

			vsel = DIV_ROUND_UP(min_uV - 2161000, 38600);

		break;

	}