aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@codeaurora.org>2010-11-17 18:30:27 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-01-12 09:33:00 -0500
commitc5e28ed78274468b92522e7f1e9a5e6080559100 (patch)
treefd8591753f8f644280e083b4b128fca2a035c6ef /drivers/regulator
parent7bed08c56540825ab9c7909a12e9b5bcdafa62ba (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.c22
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 @@
13 * 13 *
14 */ 14 */
15 15
16#define pr_fmt(fmt) "%s:" fmt, __func__
17
16#include <linux/kernel.h> 18#include <linux/kernel.h>
17#include <linux/init.h> 19#include <linux/init.h>
18#include <linux/device.h> 20#include <linux/device.h>
@@ -771,8 +773,8 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
771 773
772 /* else require explicit machine-level constraints */ 774 /* else require explicit machine-level constraints */
773 if (cmin <= 0 || cmax <= 0 || cmax < cmin) { 775 if (cmin <= 0 || cmax <= 0 || cmax < cmin) {
774 pr_err("%s: %s '%s' voltage constraints\n", 776 pr_err("%s '%s' voltage constraints\n", "invalid",
775 __func__, "invalid", name); 777 name);
776 return -EINVAL; 778 return -EINVAL;
777 } 779 }
778 780
@@ -793,22 +795,22 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
793 795
794 /* final: [min_uV..max_uV] valid iff constraints valid */ 796 /* final: [min_uV..max_uV] valid iff constraints valid */
795 if (max_uV < min_uV) { 797 if (max_uV < min_uV) {
796 pr_err("%s: %s '%s' voltage constraints\n", 798 pr_err("%s '%s' voltage constraints\n", "unsupportable",
797 __func__, "unsupportable", name); 799 name);
798 return -EINVAL; 800 return -EINVAL;
799 } 801 }
800 802
801 /* use regulator's subset of machine constraints */ 803 /* use regulator's subset of machine constraints */
802 if (constraints->min_uV < min_uV) { 804 if (constraints->min_uV < min_uV) {
803 pr_debug("%s: override '%s' %s, %d -> %d\n", 805 pr_debug("override '%s' %s, %d -> %d\n",
804 __func__, name, "min_uV", 806 name, "min_uV",
805 constraints->min_uV, min_uV); 807 constraints->min_uV, min_uV);
806 constraints->min_uV = min_uV; 808 constraints->min_uV = min_uV;
807 } 809 }
808 if (constraints->max_uV > max_uV) { 810 if (constraints->max_uV > max_uV) {
809 pr_debug("%s: override '%s' %s, %d -> %d\n", 811 pr_debug("override '%s' %s, %d -> %d\n",
810 __func__, name, "max_uV", 812 name, "max_uV",
811 constraints->max_uV, max_uV); 813 constraints->max_uV, max_uV);
812 constraints->max_uV = max_uV; 814 constraints->max_uV = max_uV;
813 } 815 }
814 } 816 }