p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: OMAP1/2: fix SoC name printing 

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>
This commit is contained in:
Aaro Koskinen 2018-11-19 21:46:41 +02:00 committed by Tony Lindgren
parent 3af89f2d3d
commit 04a92358b3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap1/id.c
View File

@ -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 "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) if ((omap_revision >> 8) & 0xff)
printk(KERN_INFO "%x", (omap_revision >> 8) & 0xff); pr_cont("%x", (omap_revision >> 8) & 0xff);
printk(KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n", pr_cont(" revision %i handled as %02xxx id: %08x%08x\n",
die_rev, omap_revision & 0xff, system_serial_low, die_rev, omap_revision & 0xff, system_serial_low,
system_serial_high); system_serial_high);
} }

4
arch/arm/mach-omap2/id.c
View File

@ -199,8 +199,8 @@ void __init omap2xxx_check_revision(void)
pr_info("%s", soc_name); pr_info("%s", soc_name);
if ((omap_rev() >> 8) & 0x0f) if ((omap_rev() >> 8) & 0x0f)
pr_info("%s", soc_rev); pr_cont("%s", soc_rev);
pr_info("\n"); pr_cont("\n");
} }
#define OMAP3_SHOW_FEATURE(feat) \ #define OMAP3_SHOW_FEATURE(feat) \