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/powerdomain44xx.c | |
| parent | f191f40c1819ffdca05408e6349f7fd30ef1cc36 (diff) | |
| parent | 7852ec0536ca39cefffc6301dc77f8ae55592926 (diff) | |
| download | linux-3c101c41fbe5daf88afbbd575542aa1d047812bb.tar.gz | |
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/powerdomain44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain44xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/powerdomain44xx.c b/arch/arm/mach-omap2/powerdomain44xx.c index 601325b852a4..aeac6f35ca10 100644 --- a/arch/arm/mach-omap2/powerdomain44xx.c +++ b/arch/arm/mach-omap2/powerdomain44xx.c @@ -198,8 +198,8 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm) udelay(1); if (c > PWRDM_TRANSITION_BAILOUT) { - printk(KERN_ERR "powerdomain: waited too long for " - "powerdomain %s to complete transition\n", pwrdm->name); + pr_err("powerdomain: %s: waited too long to complete transition\n", + pwrdm->name); return -EAGAIN; } |