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

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

regulator: Fix obfuscated log messages 



Don't use %s to format fixed static strings into log messages, it just
makes searching for and reading the message in the kernel source
needlessly hard.

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

drivers/regulator/core.c

+6 −8
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, 


		/* else require explicit machine-level constraints */

		if (cmin <= 0 || cmax <= 0 || cmax < cmin) {

			pr_err("%s '%s' voltage constraints\n", "invalid",

			pr_err("invalid '%s' voltage constraints\n",

				name);

			return -EINVAL;

		}
@@ -782,22 +782,20 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, 


		/* final: [min_uV..max_uV] valid iff constraints valid */

		if (max_uV < min_uV) {

			pr_err("%s '%s' voltage constraints\n", "unsupportable",

			pr_err("unsupportable '%s' voltage constraints\n",

				name);

			return -EINVAL;

		}



		/* use regulator's subset of machine constraints */

		if (constraints->min_uV < min_uV) {

			pr_debug("override '%s' %s, %d -> %d\n",

				 name, "min_uV",

				 constraints->min_uV, min_uV);

			pr_debug("override '%s' min_uV, %d -> %d\n",

				 name, constraints->min_uV, min_uV);

			constraints->min_uV = min_uV;

		}

		if (constraints->max_uV > max_uV) {

			pr_debug("override '%s' %s, %d -> %d\n",

				 name, "max_uV",

				 constraints->max_uV, max_uV);

			pr_debug("override '%s' max_uV, %d -> %d\n",

				 name, constraints->max_uV, max_uV);

			constraints->max_uV = max_uV;

		}

	}