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

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

regulator: palmas: Slightly code change for better readability 



It's a little bit hard to read that the "else" case means id == PALMAS_REG_SMPS10.

if (id != PALMAS_REG_SMPS10){
        do something for the cases id != PALMAS_REG_SMPS10;
} else {
        do something for the case id == PALMAS_REG_SMPS10;
}

This patch changes above syntax to switch statement.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 999f0c7c

drivers/regulator/palmas-regulator.c

+16 −12
Original line number Diff line number Diff line
@@ -516,7 +516,15 @@ static int palmas_smps_init(struct palmas *palmas, int id, 
	if (ret)

		return ret;



	if (id != PALMAS_REG_SMPS10) {

	switch (id) {

	case PALMAS_REG_SMPS10:

		if (reg_init->mode_sleep) {

			reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;

			reg |= reg_init->mode_sleep <<

					PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT;

		}

		break;

	default:

		if (reg_init->warm_reset)

			reg |= PALMAS_SMPS12_CTRL_WR_S;
@@ -528,14 +536,8 @@ static int palmas_smps_init(struct palmas *palmas, int id, 
			reg |= reg_init->mode_sleep <<

					PALMAS_SMPS12_CTRL_MODE_SLEEP_SHIFT;

		}

	} else {

		if (reg_init->mode_sleep) {

			reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;

			reg |= reg_init->mode_sleep <<

					PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT;

	}



	}

	ret = palmas_smps_write(palmas, addr, reg);

	if (ret)

		return ret;
@@ -659,10 +661,8 @@ static __devinit int palmas_probe(struct platform_device *pdev) 
		pmic->desc[id].name = palmas_regs_info[id].name;

		pmic->desc[id].id = id;



		if (id != PALMAS_REG_SMPS10) {

			pmic->desc[id].ops = &palmas_ops_smps;

			pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;

		} else {

		switch (id) {

		case PALMAS_REG_SMPS10:

			pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;

			pmic->desc[id].ops = &palmas_ops_smps10;

			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
@@ -671,6 +671,10 @@ static __devinit int palmas_probe(struct platform_device *pdev) 
			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;

			pmic->desc[id].min_uV = 3750000;

			pmic->desc[id].uV_step = 1250000;

			break;

		default:

			pmic->desc[id].ops = &palmas_ops_smps;

			pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;

		}



		pmic->desc[id].type = REGULATOR_VOLTAGE;