summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-12 20:42:36 -0700
committerTony Lindgren <tony@atomide.com>2012-09-12 20:42:36 -0700
commit3c101c41fbe5daf88afbbd575542aa1d047812bb (patch)
tree97b8837a7ef888f07d01ff7109303402dd8fed2e /arch/arm/mach-omap2/board-n8x0.c
parentf191f40c1819ffdca05408e6349f7fd30ef1cc36 (diff)
parent7852ec0536ca39cefffc6301dc77f8ae55592926 (diff)
downloadop-kernel-dev-3c101c41fbe5daf88afbbd575542aa1d047812bb.zip
op-kernel-dev-3c101c41fbe5daf88afbbd575542aa1d047812bb.tar.gz
Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse
smatch and string-wrapping cleanups for the OMAP subarch code. These changes fix some of the more meaningful warnings that smatch returns for the OMAP subarch code, and unwraps strings that are wrapped at the 80-column boundary, to conform with the current practice. Basic build, boot, and PM logs are available here: http://www.pwsan.com/omap/testlogs/warnings_a_cleanup_3.7/20120912025927/
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index d8deaea..4b43fe3 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -550,8 +550,8 @@ static int n8x0_auto_sleep_regulators(void)
ret = menelaus_set_regulator_sleep(1, val);
if (ret < 0) {
- printk(KERN_ERR "Could not set regulators to sleep on "
- "menelaus: %u\n", ret);
+ pr_err("Could not set regulators to sleep on menelaus: %u\n",
+ ret);
return ret;
}
return 0;
@@ -563,8 +563,7 @@ static int n8x0_auto_voltage_scale(void)
ret = menelaus_set_vcore_hw(1400, 1050);
if (ret < 0) {
- printk(KERN_ERR "Could not set VCORE voltage on "
- "menelaus: %u\n", ret);
+ pr_err("Could not set VCORE voltage on menelaus: %u\n", ret);
return ret;
}
return 0;
OpenPOWER on IntegriCloud