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

Commit 75790251 authored by Mark Brown's avatar Mark Brown Committed by Liam Girdwood
Browse files

regulator: Factor out voltage set operation into a separate function 



Push all the callers of the chip set_voltage() operation out into a single
function to facilitiate future refactoring.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d9f0f287

drivers/regulator/core.c

+39 −24
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ static int _regulator_get_current_limit(struct regulator_dev *rdev); 
static unsigned int _regulator_get_mode(struct regulator_dev *rdev);

static void _notifier_call_chain(struct regulator_dev *rdev,

				  unsigned long event, void *data);

static int _regulator_do_set_voltage(struct regulator_dev *rdev,

				     int min_uV, int max_uV);



static const char *rdev_get_name(struct regulator_dev *rdev)

{
@@ -745,16 +747,13 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, 
{

	struct regulator_ops *ops = rdev->desc->ops;

	int ret;

	unsigned selector;



	/* do we need to apply the constraint voltage */

	if (rdev->constraints->apply_uV &&

		rdev->constraints->min_uV == rdev->constraints->max_uV &&

		ops->set_voltage) {

		ret = ops->set_voltage(rdev,

	    rdev->constraints->min_uV == rdev->constraints->max_uV) {

		ret = _regulator_do_set_voltage(rdev,

						rdev->constraints->min_uV,

				       rdev->constraints->max_uV,

				       &selector);

						rdev->constraints->max_uV);

		if (ret < 0) {

			rdev_err(rdev, "failed to apply %duV constraint\n",

				 rdev->constraints->min_uV);
@@ -1621,6 +1620,32 @@ int regulator_is_supported_voltage(struct regulator *regulator, 
	return 0;

}



static int _regulator_do_set_voltage(struct regulator_dev *rdev,

				     int min_uV, int max_uV)

{

	int ret;

	unsigned int selector;



	trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);



	if (rdev->desc->ops->set_voltage) {

		ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV,

						   &selector);



		if (rdev->desc->ops->list_voltage)

			selector = rdev->desc->ops->list_voltage(rdev,

								 selector);

		else

			selector = -1;

	} else {

		ret = -EINVAL;

	}



	trace_regulator_set_voltage_complete(rdev_get_name(rdev), selector);



	return ret;

}



/**

 * regulator_set_voltage - set regulator output voltage

 * @regulator: regulator source
@@ -1643,7 +1668,6 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
{

	struct regulator_dev *rdev = regulator->rdev;

	int ret;

	unsigned selector;



	mutex_lock(&rdev->mutex);
@@ -1664,16 +1688,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	if (ret < 0)

		goto out;



	trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);



	ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV, &selector);



	if (rdev->desc->ops->list_voltage)

		selector = rdev->desc->ops->list_voltage(rdev, selector);

	else

		selector = -1;



	trace_regulator_set_voltage_complete(rdev_get_name(rdev), selector);

	ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);



out:

	_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE, NULL);