ARM: OMAP1/2: fix SoC name printing

[ Upstream commit 04a92358b3964988c78dfe370a559ae550383886 ]

Currently we get extra newlines on OMAP1/2 when the SoC name is printed:

[    0.000000] OMAP1510
[    0.000000]  revision 2 handled as 15xx id: bc058c9b93111a16

[    0.000000] OMAP2420
[    0.000000]

Fix by using pr_cont.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 52de382..7e49dfd 100644 (file)
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -200,10 +200,10 @@ void __init omap_check_revision(void)
                printk(KERN_INFO "Unknown OMAP cpu type: 0x%02x\n", cpu_type);
        }
 
-       printk(KERN_INFO "OMAP%04x", omap_revision >> 16);
+       pr_info("OMAP%04x", omap_revision >> 16);
        if ((omap_revision >> 8) & 0xff)
-               printk(KERN_INFO "%x", (omap_revision >> 8) & 0xff);
-       printk(KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n",
+               pr_cont("%x", (omap_revision >> 8) & 0xff);
+       pr_cont(" revision %i handled as %02xxx id: %08x%08x\n",
               die_rev, omap_revision & 0xff, system_serial_low,
               system_serial_high);
 }

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 8a2ae82..9651872 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -199,8 +199,8 @@ void __init omap2xxx_check_revision(void)
 
        pr_info("%s", soc_name);
        if ((omap_rev() >> 8) & 0x0f)
-               pr_info("%s", soc_rev);
-       pr_info("\n");
+               pr_cont("%s", soc_rev);
+       pr_cont("\n");
 }
 
 #define OMAP3_SHOW_FEATURE(feat)               \