From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753393AbcAPX0C (ORCPT ); Sat, 16 Jan 2016 18:26:02 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35451 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753239AbcAPXYk (ORCPT ); Sat, 16 Jan 2016 18:24:40 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Rob Herring , Grant Likely Cc: Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Kevin Cernekee , Jon Hunter , Paul Burton , Masahiro Yamada , Sebastian Frias , Peter Hurley Subject: [PATCH v6 09/12] serial: earlycon: Show the earlycon "driver" in banner Date: Sat, 16 Jan 2016 15:23:46 -0800 Message-Id: <1452986629-17210-10-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452986629-17210-1-git-send-email-peter@hurleysoftware.com> References: <1452980244-20512-1-git-send-email-peter@hurleysoftware.com> <1452986629-17210-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Output the earlycon "driver" from the just-parsed console 'name' and 'index' fields. NB: ->mapbase is a resource_size_t so use %pa format specifier Acked-by: Rob Herring Signed-off-by: Peter Hurley --- drivers/tty/serial/earlycon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 36b79f1..067783f 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -76,16 +76,16 @@ static void __init earlycon_init(struct earlycon_device *device, if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM16 || port->iotype == UPIO_MEM32 || port->iotype == UPIO_MEM32BE) - pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n", + pr_info("%s%d at MMIO%s %pa (options '%s')\n", + earlycon->name, earlycon->index, (port->iotype == UPIO_MEM) ? "" : (port->iotype == UPIO_MEM16) ? "16" : (port->iotype == UPIO_MEM32) ? "32" : "32be", - (unsigned long long)port->mapbase, - device->options); + &port->mapbase, device->options); else - pr_info("Early serial console at I/O port 0x%lx (options '%s')\n", - port->iobase, - device->options); + pr_info("%s%d at I/O port 0x%lx (options '%s')\n", + earlycon->name, earlycon->index, + port->iobase, device->options); } static int __init parse_options(struct earlycon_device *device, char *options) -- 2.7.0