diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-07-26 00:54:26 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-12 02:57:10 -0600 |
commit | 7852ec0536ca39cefffc6301dc77f8ae55592926 (patch) | |
tree | faa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap2/powerdomain44xx.c | |
parent | a032d33b65c89a781c871fd1def595fa6a69b52a (diff) | |
download | op-kernel-dev-7852ec0536ca39cefffc6301dc77f8ae55592926.zip op-kernel-dev-7852ec0536ca39cefffc6301dc77f8ae55592926.tar.gz |
ARM: OMAP: unwrap strings
Find and unwrap wrapped strings in the style:
pr_debug("clockdomain: hardware cannot set/clear wake up of "
"%s when %s wakes up\n", clkdm1->name, clkdm2->name);
Keeping these strings contiguous seems to be the current Linux kernel
policy.
The offending lines were found with the following command:
pcregrep -rnM '"\s*$\s*"' arch/arm/*omap*
While here, some messages have been clarified, some pr_warning(
... calls have been converted to pr_warn( ..., and some printk(KERN_*
... have been converted to pr_*.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
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 601325b..aeac6f3 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; } |