summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock3xxx.c
diff options
context:
space:
mode:
authorPaul Walmsley2012-07-26 08:54:26 +0200
committerPaul Walmsley2012-09-12 10:57:10 +0200
commit7852ec0536ca39cefffc6301dc77f8ae55592926 (patch)
treefaa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap2/clock3xxx.c
parentARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ... (diff)
downloadkernel-qcow2-linux-7852ec0536ca39cefffc6301dc77f8ae55592926.tar.gz
kernel-qcow2-linux-7852ec0536ca39cefffc6301dc77f8ae55592926.tar.xz
kernel-qcow2-linux-7852ec0536ca39cefffc6301dc77f8ae55592926.zip
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/clock3xxx.c')
-rw-r--r--arch/arm/mach-omap2/clock3xxx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx.c b/arch/arm/mach-omap2/clock3xxx.c
index 794d82702c85..912108e7d515 100644
--- a/arch/arm/mach-omap2/clock3xxx.c
+++ b/arch/arm/mach-omap2/clock3xxx.c
@@ -49,8 +49,7 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate)
* on DPLL4.
*/
if (omap_rev() == OMAP3430_REV_ES1_0) {
- pr_err("clock: DPLL4 cannot change rate due to "
- "silicon 'Limitation 2.5' on 3430ES1.\n");
+ pr_err("clock: DPLL4 cannot change rate due to silicon 'Limitation 2.5' on 3430ES1.\n");
return -EINVAL;
}