diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-12 23:42:36 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 23:42:36 -0400 |
commit | 3c101c41fbe5daf88afbbd575542aa1d047812bb (patch) | |
tree | 97b8837a7ef888f07d01ff7109303402dd8fed2e /arch/arm/mach-omap2/common-board-devices.c | |
parent | f191f40c1819ffdca05408e6349f7fd30ef1cc36 (diff) | |
parent | 7852ec0536ca39cefffc6301dc77f8ae55592926 (diff) |
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/common-board-devices.c')
-rw-r--r-- | arch/arm/mach-omap2/common-board-devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 013fedc9e131..f81dd0a18aaf 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c | |||
@@ -120,8 +120,7 @@ void __init omap_nand_flash_init(int options, struct mtd_partition *parts, | |||
120 | } | 120 | } |
121 | 121 | ||
122 | if (nandcs > GPMC_CS_NUM) { | 122 | if (nandcs > GPMC_CS_NUM) { |
123 | printk(KERN_INFO "NAND: Unable to find configuration " | 123 | pr_info("NAND: Unable to find configuration in GPMC\n"); |
124 | "in GPMC\n "); | ||
125 | return; | 124 | return; |
126 | } | 125 | } |
127 | 126 | ||