diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-11-17 15:30:27 -0800 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-01-12 14:33:00 +0000 |
| commit | c5e28ed78274468b92522e7f1e9a5e6080559100 (patch) | |
| tree | fd8591753f8f644280e083b4b128fca2a035c6ef /drivers/regulator | |
| parent | 7bed08c56540825ab9c7909a12e9b5bcdafa62ba (diff) | |
drivers: regulator: core: use pr_fmt
This adds a pr_fmt line which uses the __func__ macro. I also
convert the current pr_ lines to remove their __func__ usage.
Cc: bleong@codeaurora.org
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a48cf582dcd0..7c0906367239 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -13,6 +13,8 @@ * */ +#define pr_fmt(fmt) "%s:" fmt, __func__ + #include <linux/kernel.h> #include <linux/init.h> #include <linux/device.h> @@ -771,8 +773,8 @@ 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 '%s' voltage constraints\n", - __func__, "invalid", name); + pr_err("%s '%s' voltage constraints\n", "invalid", + name); return -EINVAL; } @@ -793,22 +795,22 @@ 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 '%s' voltage constraints\n", - __func__, "unsupportable", name); + pr_err("%s '%s' voltage constraints\n", "unsupportable", + name); return -EINVAL; } /* use regulator's subset of machine constraints */ if (constraints->min_uV < min_uV) { - pr_debug("%s: override '%s' %s, %d -> %d\n", - __func__, name, "min_uV", - constraints->min_uV, min_uV); + pr_debug("override '%s' %s, %d -> %d\n", + name, "min_uV", + constraints->min_uV, min_uV); constraints->min_uV = min_uV; } if (constraints->max_uV > max_uV) { - pr_debug("%s: override '%s' %s, %d -> %d\n", - __func__, name, "max_uV", - constraints->max_uV, max_uV); + pr_debug("override '%s' %s, %d -> %d\n", + name, "max_uV", + constraints->max_uV, max_uV); constraints->max_uV = max_uV; } } |