From patchwork Mon Nov 19 19:46:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 10689351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9979F13AD for ; Mon, 19 Nov 2018 19:47:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89C282A4E8 for ; Mon, 19 Nov 2018 19:47:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D95E2A4ED; Mon, 19 Nov 2018 19:47:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D24ED2A4E8 for ; Mon, 19 Nov 2018 19:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=KCZHQkW9ii77MZsoyTqhHUMKoUz5hgMUXoHDglc5Jmw=; b=Ma/ 1aqSNsE/1xvcvl+KyeuUaugq0KgwuvNByo0AAREhHCOfJIBH96qN7jaxSL3qiiydHE+KbVsiRP7cC 9NV95DJ1y3lJrlISXVRv3tTbgpdQ4k5rQpYfuK5LbWUJG3M35jtFXn1F6tkxXlLsVuLwCRtQUCxx1 akQBkJ6ZLCBjpCv8Ce3CzMX6s9ClK61ADaQtbZfNuRcWe+7O5hPSYlzAWIu5uXmwKadl0F8VOQZY+ YqUr3Uo4KnUwLzlqym2cxjGj6HPLtb5GBEi4dR5ugyNHRXQAI0Wu7nQbsYYBquTzw6uLOdQGpW6kM ncY1cN4P0P1NyB7yqOIrWLYx3OsZ23A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gOpVt-0006S4-OZ; Mon, 19 Nov 2018 19:47:17 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gOpVr-0006Rs-2E for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Nov 2018 19:47:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Hziwizg+jbwVseIuF1c/Jtr2LGfcURJK5sdR+24bx/k=; b=AGg3DQ2gVfgYx2yejKA2rS643 HUTQNrr+jU8BL9b3R9frjIn8GrprFYIyXwKPQMYsfRnqytdONYgH+kJI0MUOJPHG4PRGKG7BUQ7i5 Wd05/DX8yUBoSCOgvLSiCTqkgOlsif9nwrlllKcOr2Q2QLOkV6v1vOxJe/+UjdmIpC3MhFB068Tz+ oxYL54OmhGv+uAqgJA4lD2S6lGK2f0/92WplbiIU66zyOnf6EjoU7/zJvFk9wRjGf1Y9A1z1Ppur7 HnjVQv3ecQD2BeUMEquyxzH27UH3+68QLxhc+VXFPqtMt/L65lWx7zZy15akTUF0pasVj+SGxiGNQ O9rRrk7Fg==; Received: from emh06.mail.saunalahti.fi ([62.142.5.116]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gOpVn-000543-To for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2018 19:47:13 +0000 Received: from localhost.localdomain (85-76-71-135-nat.elisa-mobile.fi [85.76.71.135]) by emh06.mail.saunalahti.fi (Postfix) with ESMTP id 607E430043; Mon, 19 Nov 2018 21:46:51 +0200 (EET) From: Aaro Koskinen To: Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH] ARM: OMAP1/2: fix SoC name printing Date: Mon, 19 Nov 2018 21:46:41 +0200 Message-Id: <20181119194641.303-1-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181119_144712_080159_5FD09F87 X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aaro Koskinen MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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) \