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

Commit 31dfe686 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Mark Brown
Browse files

regulator: core: Simplify error flow in _regulator_do_set_voltage() 



If the voltage can not be set jump to the end of the function. This
avoids having to check for an error multiple times and eliminates one
level of nesting in a follow-up change.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 57995a48

drivers/regulator/core.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2800,8 +2800,11 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, 
		ret = -EINVAL;

		ret = -EINVAL;

	}

	}





	if (ret)

		goto out;



	/* Call set_voltage_time_sel if successfully obtained old_selector */

	/* Call set_voltage_time_sel if successfully obtained old_selector */

	if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0

	if (!rdev->constraints->ramp_disable && old_selector >= 0

		&& old_selector != selector) {

		&& old_selector != selector) {





		delay = ops->set_voltage_time_sel(rdev,

		delay = ops->set_voltage_time_sel(rdev,
@@ -2821,13 +2824,14 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, 
		}

		}

	}

	}





	if (ret == 0 && best_val >= 0) {

	if (best_val >= 0) {

		unsigned long data = best_val;

		unsigned long data = best_val;





		_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE,

		_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE,

				     (void *)data);

				     (void *)data);

	}

	}





out:

	trace_regulator_set_voltage_complete(rdev_get_name(rdev), best_val);

	trace_regulator_set_voltage_complete(rdev_get_name(rdev), best_val);





	return ret;

	return ret;