[src/trunk]: src/sys/arch Fix blank line printed at attach on ACPI

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/049eb341138f
branches:  trunk
changeset: 445332:049eb341138f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Oct 23 09:15:35 2018 +0000

description:
Fix blank line printed at attach on ACPI

diffstat:

 sys/arch/arm/fdt/plcom_fdt.c        |  8 ++++++--
 sys/arch/arm/imx/imx23_plcom.c      |  5 ++++-
 sys/arch/evbarm/dev/plcom.c         |  7 ++-----
 sys/arch/evbarm/ifpga/plcom_ifpga.c |  7 +++++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diffs (111 lines):

diff -r 4d118e10b12e -r 049eb341138f sys/arch/arm/fdt/plcom_fdt.c
--- a/sys/arch/arm/fdt/plcom_fdt.c      Tue Oct 23 08:38:18 2018 +0000
+++ b/sys/arch/arm/fdt/plcom_fdt.c      Tue Oct 23 09:15:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom_fdt.c,v 1.2 2018/09/07 12:50:58 jmcneill Exp $ */
+/* $NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.2 2018/09/07 12:50:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -102,6 +102,10 @@
                aprint_error(": couldn't map device\n");
                return;
        }
+
+       aprint_naive("\n");
+       aprint_normal(": ARM PL011 UART\n");
+
        plcom_attach_subr(sc);
 
        aprint_normal_dev(self, "interrupting on %s\n", intrstr);
diff -r 4d118e10b12e -r 049eb341138f sys/arch/arm/imx/imx23_plcom.c
--- a/sys/arch/arm/imx/imx23_plcom.c    Tue Oct 23 08:38:18 2018 +0000
+++ b/sys/arch/arm/imx/imx23_plcom.c    Tue Oct 23 09:15:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_plcom.c,v 1.1 2012/11/20 19:06:13 jkunz Exp $ */
+/* $Id: imx23_plcom.c,v 1.2 2018/10/23 09:15:35 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -83,6 +83,9 @@
        if (plcom_attached)
                return;
 
+       aprint_naive("\n");
+       aprint_normal("\n");
+
        sc->sc_dev = self;
        sc->sc_frequency = IMX23_UART_CLK;
        sc->sc_hwflags = PLCOM_HW_TXFIFO_DISABLE;
diff -r 4d118e10b12e -r 049eb341138f sys/arch/evbarm/dev/plcom.c
--- a/sys/arch/evbarm/dev/plcom.c       Tue Oct 23 08:38:18 2018 +0000
+++ b/sys/arch/evbarm/dev/plcom.c       Tue Oct 23 09:15:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plcom.c,v 1.55 2018/10/12 23:57:00 jmcneill Exp $      */
+/*     $NetBSD: plcom.c,v 1.56 2018/10/23 09:15:36 jmcneill Exp $      */
 
 /*-
  * Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.55 2018/10/12 23:57:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.56 2018/10/23 09:15:36 jmcneill Exp $");
 
 #include "opt_plcom.h"
 #include "opt_ddb.h"
@@ -438,8 +438,6 @@
        struct plcom_instance *pi = &sc->sc_pi;
        struct tty *tp;
 
-       aprint_naive("\n");
-
        callout_init(&sc->sc_diag_callout, 0);
        mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_HIGH);
 
@@ -500,7 +498,6 @@
                        break;
                }
        }
-       aprint_normal("\n");
 
        if (ISSET(sc->sc_hwflags, PLCOM_HW_TXFIFO_DISABLE)) {
                sc->sc_fifolen = 1;
diff -r 4d118e10b12e -r 049eb341138f sys/arch/evbarm/ifpga/plcom_ifpga.c
--- a/sys/arch/evbarm/ifpga/plcom_ifpga.c       Tue Oct 23 08:38:18 2018 +0000
+++ b/sys/arch/evbarm/ifpga/plcom_ifpga.c       Tue Oct 23 09:15:35 2018 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: plcom_ifpga.c,v 1.16 2013/02/19 10:57:10 skrll Exp $ */
+/*      $NetBSD: plcom_ifpga.c,v 1.17 2018/10/23 09:15:36 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -32,7 +32,7 @@
 /* Interface to plcom (PL010) serial driver. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.16 2013/02/19 10:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.17 2018/10/23 09:15:36 jmcneill Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -97,6 +97,9 @@
                return;
        }
 
+       aprint_naive("\n");
+       aprint_normal("\n");
+
        plcom_attach_subr(sc);
        isc->sc_ih = ifpga_intr_establish(ifa->ifa_irq, IPL_SERIAL,
            plcomintr, sc);