[src/trunk]: src/sys/arch/mips/ingenic always print the child devices' addres...

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

details:   https://anonhg.NetBSD.org/src/rev/06f6c5b6df50
branches:  trunk
changeset: 806895:06f6c5b6df50
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Mar 17 09:26:31 2015 +0000

description:
always print the child devices' address, print irq if not -1 and a driver
is actually attaching

diffstat:

 sys/arch/mips/ingenic/apbus.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 11a5e360be94 -r 06f6c5b6df50 sys/arch/mips/ingenic/apbus.c
--- a/sys/arch/mips/ingenic/apbus.c     Tue Mar 17 08:15:48 2015 +0000
+++ b/sys/arch/mips/ingenic/apbus.c     Tue Mar 17 09:26:31 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apbus.c,v 1.8 2015/03/17 07:25:07 macallan Exp $ */
+/*     $NetBSD: apbus.c,v 1.9 2015/03/17 09:26:31 macallan Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
 /* catch-all for on-chip peripherals */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.8 2015/03/17 07:25:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.9 2015/03/17 09:26:31 macallan Exp $");
 
 #include "locators.h"
 #define        _MIPS_BUS_DMA_PRIVATE
@@ -170,11 +170,11 @@
 
        if (pnp) {
                aprint_normal("%s at %s", aa->aa_name, pnp);
-               if (aa->aa_addr != -1)
-                       aprint_normal(" addr 0x%" PRIxBUSADDR, aa->aa_addr);
-               if (aa->aa_irq != -1)
-                       aprint_normal(" irq %d", aa->aa_irq);
        }
+       if (aa->aa_addr != -1)
+               aprint_normal(" addr 0x%" PRIxBUSADDR, aa->aa_addr);
+       if ((pnp == NULL) && (aa->aa_irq != -1))
+               aprint_normal(" irq %d", aa->aa_irq);
        return (UNCONF);
 }