From: Mark Brown Date: Mon, 22 Nov 2010 13:51:18 +0000 (+0000) Subject: regulator: Fix obfuscated log messages X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4c35508fc0b7883820923b3b8eb9fea25d35cf72;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Liam Girdwood --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 8d492f40cebf..fe47860c6633 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; } }