[src/trunk]: src/sys/dev/pci Print device description on the same line as loc...

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

details:   https://anonhg.NetBSD.org/src/rev/a414e840303e
branches:  trunk
changeset: 746929:a414e840303e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 23 16:21:36 2009 +0000

description:
Print device description on the same line as locators.

diffstat:

 sys/dev/pci/pciide_common.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 827aa8675af1 -r a414e840303e sys/dev/pci/pciide_common.c
--- a/sys/dev/pci/pciide_common.c       Sun Aug 23 16:15:45 2009 +0000
+++ b/sys/dev/pci/pciide_common.c       Sun Aug 23 16:21:36 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $        */
+/*     $NetBSD: pciide_common.c,v 1.42 2009/08/23 16:21:36 jmcneill Exp $      */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.42 2009/08/23 16:21:36 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -132,7 +132,6 @@
        const char *displaydev;
 
        aprint_naive(": disk controller\n");
-       aprint_normal("\n");
 
        sc->sc_pci_id = pa->pa_id;
        if (pp == NULL) {
@@ -147,9 +146,10 @@
 
        /* if displaydev == NULL, printf is done in chip-specific map */
        if (displaydev)
-               aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
-                   "%s (rev. 0x%02x)\n", displaydev,
+               aprint_normal(": %s (rev. 0x%02x)\n", displaydev,
                    PCI_REVISION(pa->pa_class));
+       else
+               aprint_normal("\n");
 
        sc->sc_pc = pa->pa_pc;
        sc->sc_tag = pa->pa_tag;