* [PATCH] ARM: OMAP1/2: fix SoC name printing
@ 2018-11-19 19:46 Aaro Koskinen
2018-11-29 20:06 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Aaro Koskinen @ 2018-11-19 19:46 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-arm-kernel, linux-kernel, Aaro Koskinen
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>
---
arch/arm/mach-omap1/id.c | 6 +++---
arch/arm/mach-omap2/id.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 52de382fc804..7e49dfda3d2f 100644
--- 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 68ba5f472f6b..859c71c4e932 100644
--- 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) \
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: OMAP1/2: fix SoC name printing
2018-11-19 19:46 [PATCH] ARM: OMAP1/2: fix SoC name printing Aaro Koskinen
@ 2018-11-29 20:06 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2018-11-29 20:06 UTC (permalink / raw)
To: Aaro Koskinen; +Cc: linux-omap, linux-arm-kernel, linux-kernel
* Aaro Koskinen <aaro.koskinen@iki.fi> [181119 11:46]:
> 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.
Applying into omap-for-v4.21/omap1 thanks.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-29 20:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-19 19:46 [PATCH] ARM: OMAP1/2: fix SoC name printing Aaro Koskinen
2018-11-29 20:06 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).