[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1290036628-9928-1-git-send-email-dwalker@codeaurora.org>
Date: Wed, 17 Nov 2010 15:30:27 -0800
From: Daniel Walker <dwalker@...eaurora.org>
To: Liam Girdwood <lrg@...mlogic.co.uk>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org,
Daniel Walker <dwalker@...eaurora.org>, bleong@...eaurora.org
Subject: [PATCH 1/2] 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@...eaurora.org
Signed-off-by: Daniel Walker <dwalker@...eaurora.org>
---
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 f1d10c9..a3ca3d6 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>
@@ -765,8 +767,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;
}
@@ -787,22 +789,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;
}
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists