Unverified Commit ba576a62 authored by Jeffrey Hugo's avatar Jeffrey Hugo Committed by Mark Brown
Browse files

regulator: qcom_spmi: Refactor get_mode/set_mode 



spmi_regulator_common_get_mode and spmi_regulator_common_set_mode use
multi-level ifs which mirror a switch statement.  Refactor to use a switch
statement to make the code flow more clear.

Signed-off-by: default avatarJeffrey Hugo <jeffrey.l.hugo@gmail.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 86f4ff7a

drivers/regulator/qcom_spmi-regulator.c

+18 −8
Original line number Diff line number Diff line
@@ -911,26 +911,36 @@ static unsigned int spmi_regulator_common_get_mode(struct regulator_dev *rdev) 


	spmi_vreg_read(vreg, SPMI_COMMON_REG_MODE, &reg, 1);



	if (reg & SPMI_COMMON_MODE_HPM_MASK)

		return REGULATOR_MODE_NORMAL;

	reg &= SPMI_COMMON_MODE_HPM_MASK | SPMI_COMMON_MODE_AUTO_MASK;



	if (reg & SPMI_COMMON_MODE_AUTO_MASK)

	switch (reg) {

	case SPMI_COMMON_MODE_HPM_MASK:

		return REGULATOR_MODE_NORMAL;

	case SPMI_COMMON_MODE_AUTO_MASK:

		return REGULATOR_MODE_FAST;



	default:

		return REGULATOR_MODE_IDLE;

	}

}



static int

spmi_regulator_common_set_mode(struct regulator_dev *rdev, unsigned int mode)

{

	struct spmi_regulator *vreg = rdev_get_drvdata(rdev);

	u8 mask = SPMI_COMMON_MODE_HPM_MASK | SPMI_COMMON_MODE_AUTO_MASK;

	u8 val = 0;

	u8 val;



	if (mode == REGULATOR_MODE_NORMAL)

	switch (mode) {

	case REGULATOR_MODE_NORMAL:

		val = SPMI_COMMON_MODE_HPM_MASK;

	else if (mode == REGULATOR_MODE_FAST)

		break;

	case REGULATOR_MODE_FAST:

		val = SPMI_COMMON_MODE_AUTO_MASK;

		break;

	default:

		val = 0;

		break;

	}



	return spmi_vreg_update_bits(vreg, SPMI_COMMON_REG_MODE, val, mask);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE