diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-13 05:42:36 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-13 05:42:36 +0200 |
| commit | 3c101c41fbe5daf88afbbd575542aa1d047812bb (patch) | |
| tree | 97b8837a7ef888f07d01ff7109303402dd8fed2e /arch/arm/mach-omap1/board-htcherald.c | |
| parent | Merge tag 'omap-cleanup-a-for-3.7' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: OMAP: unwrap strings (diff) | |
| download | linux-3c101c41fbe5daf88afbbd575542aa1d047812bb.tar.xz linux-3c101c41fbe5daf88afbbd575542aa1d047812bb.zip | |
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-omap1/board-htcherald.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 3 |
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 a5ac352d68d3..1dcb751b8fe5 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -475,8 +475,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); |