[src/trunk]: src/sys/arch/evbarm don't use dv_xname directly.

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

details:   https://anonhg.NetBSD.org/src/rev/8322b0b0d623
branches:  trunk
changeset: 755493:8322b0b0d623
user:      bsh <bsh%NetBSD.org@localhost>
date:      Mon Jun 07 15:17:24 2010 +0000

description:
don't use dv_xname directly.

diffstat:

 sys/arch/evbarm/g42xxeb/gb225.c         |  7 +++----
 sys/arch/evbarm/g42xxeb/gb225_pcic.c    |  2 +-
 sys/arch/evbarm/g42xxeb/gb225_slhci.c   |  8 +++-----
 sys/arch/evbarm/g42xxeb/obio.c          |  7 +++----
 sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c |  9 ++++-----
 5 files changed, 14 insertions(+), 19 deletions(-)

diffs (134 lines):

diff -r 38684ad7b21c -r 8322b0b0d623 sys/arch/evbarm/g42xxeb/gb225.c
--- a/sys/arch/evbarm/g42xxeb/gb225.c   Mon Jun 07 14:12:20 2010 +0000
+++ b/sys/arch/evbarm/g42xxeb/gb225.c   Mon Jun 07 15:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gb225.c,v 1.8 2010/03/13 11:26:42 bsh Exp $ */
+/*     $NetBSD: gb225.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec corp.  All rights reserved.
@@ -146,7 +146,7 @@
        /* Map on-board FPGA registers */
        if( bus_space_map( iot, GB225_PLDREG_BASE, GB225_PLDREG_SIZE,
            0, &(sc->sc_ioh) ) ){
-               aprint_error("%s: can't map FPGA registers\n", self->dv_xname);
+               aprint_error_dev(self, "can't map FPGA registers\n");
        }
 
        aprint_normal("\n");
@@ -165,8 +165,7 @@
 #endif
 
 #ifdef DEBUG
-       printf("%s: CF_DET=%x PCMCIA_DET=%x\n",
-           self->dv_xname,
+       aprint_debug_dev(self, "CF_DET=%x PCMCIA_DET=%x\n",
            bus_space_read_1(sc->sc_iot, sc->sc_ioh, GB225_CFDET),
            bus_space_read_1(sc->sc_iot, sc->sc_ioh, GB225_PCMCIADET));
 #endif
diff -r 38684ad7b21c -r 8322b0b0d623 sys/arch/evbarm/g42xxeb/gb225_pcic.c
--- a/sys/arch/evbarm/g42xxeb/gb225_pcic.c      Mon Jun 07 14:12:20 2010 +0000
+++ b/sys/arch/evbarm/g42xxeb/gb225_pcic.c      Mon Jun 07 15:17:24 2010 +0000
@@ -242,7 +242,7 @@
        }
        splx(s);
 
-       DPRINTF(("%s: card %d %s\n", sc->sc_pc.sc_dev.dv_xname, sock_no,
+       DPRINTF(("%s: card %d %s\n", device_xname(sc->sc_pc.sc_dev), sock_no,
            HAVE_CARD(val) ? "inserted" : "removed"));
 
        sapcic_intr(arg);
diff -r 38684ad7b21c -r 8322b0b0d623 sys/arch/evbarm/g42xxeb/gb225_slhci.c
--- a/sys/arch/evbarm/g42xxeb/gb225_slhci.c     Mon Jun 07 14:12:20 2010 +0000
+++ b/sys/arch/evbarm/g42xxeb/gb225_slhci.c     Mon Jun 07 15:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gb225_slhci.c,v 1.4 2008/04/28 20:23:16 martin Exp $ */
+/*     $NetBSD: gb225_slhci.c,v 1.5 2010/06/07 15:17:24 bsh Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -129,8 +129,7 @@
 
        /* Map I/O space */
        if (bus_space_map(iot, oba->oba_addr, PORTSIZE, 0, &ioh)) {
-               printf("%s: can't map I/O space\n",
-                       sc->sc_sc.sc_bus.bdev.dv_xname);
+               aprint_error_dev(self, "can't map I/O space\n");
                return;
        }
 
@@ -146,8 +145,7 @@
        sc->sc_ih = obio_intr_establish(bsc, oba->oba_intr, IPL_BIO, 
            IST_LEVEL_HIGH, slhci_opio_intr, sc);
        if( sc->sc_ih == NULL) {
-               printf("%s: can't establish interrupt\n",
-                       sc->sc_sc.sc_bus.bdev.dv_xname);
+               aprint_error_dev(self, "can't establish interrupt\n");
                return;
        }
 
diff -r 38684ad7b21c -r 8322b0b0d623 sys/arch/evbarm/g42xxeb/obio.c
--- a/sys/arch/evbarm/g42xxeb/obio.c    Mon Jun 07 14:12:20 2010 +0000
+++ b/sys/arch/evbarm/g42xxeb/obio.c    Mon Jun 07 15:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obio.c,v 1.8 2010/03/13 11:26:42 bsh Exp $ */
+/*     $NetBSD: obio.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec corp.  All rights reserved.
@@ -265,7 +265,7 @@
        return;
 
  fail:
-       aprint_error( "%s: can't map FPGA registers\n", self->dv_xname );
+       aprint_error_dev(self, "can't map FPGA registers\n");
 }
 
 int
@@ -369,8 +369,7 @@
        restore_interrupts(save);
 
        if (error)
-               aprint_error("%s: bad intr_disestablish\n", 
-                   device_xname(sc->sc_dev));
+               aprint_error_dev(sc->sc_dev, "bad intr_disestablish\n");
 }
 
 void
diff -r 38684ad7b21c -r 8322b0b0d623 sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
--- a/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c   Mon Jun 07 14:12:20 2010 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c   Mon Jun 07 15:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_kbd.c,v 1.5 2008/01/06 01:37:58 matt Exp $ */
+/* $NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.5 2008/01/06 01:37:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -323,8 +323,7 @@
        sc->soft_ih = softint_establish(SOFTINT_SERIAL, sskbd_soft_intr, sc);
 
        if (sc->atn_ih == NULL || sc->spi_ih == NULL)
-               aprint_error("%s: can't establish interrupt handler\n",
-                   sc->dev.dv_xname);
+               aprint_error_dev(self, "can't establish interrupt handler\n");
 
        /* setup SPI control register, and prescaler */
        s3c24x0_spi_setup((struct ssspi_softc *)device_parent(self), 
@@ -448,7 +447,7 @@
        struct sskbd_softc *sc = v;
 
 #ifdef KBD_DEBUG
-       printf("%s: enable\n", sc->dev.dv_xname);
+       printf("%s: enable\n", device_xname(sc->dev));
 #endif
 
 #if 0