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

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

regulator: Additional diagnostics for machine constraints 



Try to find a human readable name for the regulator we're failing on and
print a specific diagnostic when we fail to set the suspend state.

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

drivers/regulator/core.c

+19 −4
Original line number Diff line number Diff line
@@ -669,6 +669,14 @@ static int set_machine_constraints(struct regulator_dev *rdev, 
	struct regulation_constraints *constraints)

{

	int ret = 0;

	const char *name;



	if (constraints->name)

		name = constraints->name;

	else if (rdev->desc->name)

		name = rdev->desc->name;

	else

		name = "regulator";



	rdev->constraints = constraints;
@@ -679,9 +687,9 @@ static int set_machine_constraints(struct regulator_dev *rdev, 
		ret = rdev->desc->ops->set_voltage(rdev,

			rdev->constraints->min_uV, rdev->constraints->max_uV);

			if (ret < 0) {

				printk(KERN_ERR "%s: failed to apply %duV"

					" constraint\n", __func__,

					rdev->constraints->min_uV);

				printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n",

				       __func__,

				       rdev->constraints->min_uV, name);

				rdev->constraints = NULL;

				goto out;

			}
@@ -692,8 +700,15 @@ static int set_machine_constraints(struct regulator_dev *rdev, 
		rdev->use_count = 1;



	/* do we need to setup our suspend state */

	if (constraints->initial_state)

	if (constraints->initial_state) {

		ret = suspend_prepare(rdev, constraints->initial_state);

		if (ret < 0) {

			printk(KERN_ERR "%s: failed to set suspend state for %s\n",

			       __func__, name);

			rdev->constraints = NULL;

			goto out;

		}

	}



	print_constraints(rdev);

out: