summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/board-htcherald.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-07-26 10:54:26 +0400
committerPaul Walmsley <paul@pwsan.com>2012-09-12 12:57:10 +0400
commit7852ec0536ca39cefffc6301dc77f8ae55592926 (patch)
treefaa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap1/board-htcherald.c
parenta032d33b65c89a781c871fd1def595fa6a69b52a (diff)
downloadlinux-7852ec0536ca39cefffc6301dc77f8ae55592926.tar.xz
ARM: OMAP: unwrap strings
Find and unwrap wrapped strings in the style: pr_debug("clockdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n", clkdm1->name, clkdm2->name); Keeping these strings contiguous seems to be the current Linux kernel policy. The offending lines were found with the following command: pcregrep -rnM '"\s*$\s*"' arch/arm/*omap* While here, some messages have been clarified, some pr_warning( ... calls have been converted to pr_warn( ..., and some printk(KERN_* ... have been converted to pr_*. Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-htcherald.c')
-rw-r--r--arch/arm/mach-omap1/board-htcherald.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index b3f6e943e661..f0ef0082c317 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -476,8 +476,7 @@ static void __init htcherald_lcd_init(void)
break;
}
if (!tries)
- printk(KERN_WARNING "Timeout waiting for end of frame "
- "-- LCD may not be available\n");
+ pr_err("Timeout waiting for end of frame -- LCD may not be available\n");
/* turn off DMA */
reg = omap_readw(OMAP_DMA_LCD_CCR);