diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-12 20:42:36 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 20:42:36 -0700 |
| commit | 3c101c41fbe5daf88afbbd575542aa1d047812bb (patch) | |
| tree | 97b8837a7ef888f07d01ff7109303402dd8fed2e /arch/arm/mach-omap2/prcm.c | |
| parent | f191f40c1819ffdca05408e6349f7fd30ef1cc36 (diff) | |
| parent | 7852ec0536ca39cefffc6301dc77f8ae55592926 (diff) | |
| download | linux-stable-3c101c41fbe5daf88afbbd575542aa1d047812bb.tar.gz linux-stable-3c101c41fbe5daf88afbbd575542aa1d047812bb.tar.bz2 linux-stable-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/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 9c9d23c10205..0f51e034e0aa 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -139,11 +139,11 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, MAX_MODULE_ENABLE_WAIT, i); if (i < MAX_MODULE_ENABLE_WAIT) - pr_debug("cm: Module associated with clock %s ready after %d " - "loops\n", name, i); + pr_debug("cm: Module associated with clock %s ready after %d loops\n", + name, i); else - pr_err("cm: Module associated with clock %s didn't enable in " - "%d tries\n", name, MAX_MODULE_ENABLE_WAIT); + pr_err("cm: Module associated with clock %s didn't enable in %d tries\n", + name, MAX_MODULE_ENABLE_WAIT); return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0; }; |