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-omap2/serial.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-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 7ca266e987f6..0405c8190803 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -232,9 +232,8 @@ static int __init omap_serial_early_init(void) if (console_loglevel >= 10) { uart_debug = true; - pr_info("%s used as console in debug mode" - " uart%d clocks will not be" - " gated", uart_name, uart->num); + pr_info("%s used as console in debug mode: uart%d clocks will not be gated", + uart_name, uart->num); } if (cmdline_find_option("no_console_suspend")) @@ -319,8 +318,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size, NULL, 0, false); - WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n", - name, oh->name); + if (IS_ERR(pdev)) { + WARN(1, "Could not build omap_device for %s: %s.\n", name, + oh->name); + return; + } if ((console_uart_id == bdata->id) && no_console_suspend) omap_device_disable_idle_on_suspend(pdev); |