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>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a48cf582dcd00bcc8a9bfd92a3dad5aede3fb708..7c0906367239a1ea1fa5c2d9702d2ff9f9e7d85b 100644 (file)
--- 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;
                }
        }