summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 13:51:18 +0000
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-01-12 14:33:00 +0000
commit4c35508fc0b7883820923b3b8eb9fea25d35cf72 (patch)
treee6cc86303886370713f7d90dfab6d79a6efed63b
parent1d7372e15ebd7f56a336fabe6ee31f8e692cd9cb (diff)
downloadlinux-3.10-4c35508fc0b7883820923b3b8eb9fea25d35cf72.tar.gz
linux-3.10-4c35508fc0b7883820923b3b8eb9fea25d35cf72.tar.bz2
linux-3.10-4c35508fc0b7883820923b3b8eb9fea25d35cf72.zip
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: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--drivers/regulator/core.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8d492f40ceb..fe47860c663 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -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;
}
}