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>

1 files changed, 8 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index ea3f565ba1a4..eeaf35367c80 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -102,8 +102,8 @@ void omap2_init_clk_clkdm(struct clk *clk)
                          clk->name, clk->clkdm_name);
                 clk->clkdm = clkdm;
         } else {
-                pr_debug("clock: could not associate clk %s to "
-                         "clkdm %s\n", clk->name, clk->clkdm_name);
+                pr_debug("clock: could not associate clk %s to clkdm %s\n",
+                         clk->name, clk->clkdm_name);
         }
 }
 
@@ -226,8 +226,7 @@ void omap2_dflt_clk_disable(struct clk *clk)
                  * 'Independent' here refers to a clock which is not
                  * controlled by its parent.
                  */
-                printk(KERN_ERR "clock: clk_disable called on independent "
-                       "clock %s which has no enable_reg\n", clk->name);
+                pr_err("clock: clk_disable called on independent clock %s which has no enable_reg\n", clk->name);
                 return;
         }
 
@@ -270,8 +269,7 @@ const struct clkops clkops_omap2_dflt = {
 void omap2_clk_disable(struct clk *clk)
 {
         if (clk->usecount == 0) {
-                WARN(1, "clock: %s: omap2_clk_disable() called, but usecount "
-                     "already 0?", clk->name);
+                WARN(1, "clock: %s: omap2_clk_disable() called, but usecount already 0?", clk->name);
                 return;
         }
 
@@ -332,8 +330,8 @@ int omap2_clk_enable(struct clk *clk)
         if (clkdm_control && clk->clkdm) {
                 ret = clkdm_clk_enable(clk->clkdm, clk);
                 if (ret) {
-                        WARN(1, "clock: %s: could not enable clockdomain %s: "
-                             "%d\n", clk->name, clk->clkdm->name, ret);
+                        WARN(1, "clock: %s: could not enable clockdomain %s: %d\n",
+                             clk->name, clk->clkdm->name, ret);
                         goto oce_err2;
                 }
         }
@@ -501,10 +499,8 @@ void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name,
 
         hfclkin_rate = clk_get_rate(hfclkin_ck);
 
-        pr_info("Switched to new clocking rate (Crystal/Core/MPU): "
-                "%ld.%01ld/%ld/%ld MHz\n",
-                (hfclkin_rate / 1000000),
-                ((hfclkin_rate / 100000) % 10),
+        pr_info("Switched to new clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n",
+                (hfclkin_rate / 1000000), ((hfclkin_rate / 100000) % 10),
                 (clk_get_rate(core_ck) / 1000000),
                 (clk_get_rate(mpu_ck) / 1000000));
 }