Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use dv_xname directly.

This commit is contained in:
bsh 2010-06-07 15:17:24 +00:00
parent 2da098d0fd
commit 6d22e186df
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/evbarm/g42xxeb/gb225.c
View File

@ -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 @@ opio_attach(device_t parent, device_t self, void *aux)
/* 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 @@ opio_attach(device_t parent, device_t self, void *aux)
#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

2
sys/arch/evbarm/g42xxeb/gb225_pcic.c
View File

@ -242,7 +242,7 @@ opcic_card_detect(void *arg, int val)
}
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);

8
sys/arch/evbarm/g42xxeb/gb225_slhci.c
View File

@ -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 @@ slhci_opio_attach(struct device *parent, struct device *self, void *aux)
/* 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 @@ slhci_opio_attach(struct device *parent, struct device *self, void *aux)
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;
}

7
sys/arch/evbarm/g42xxeb/obio.c
View File

@ -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 @@ obio_attach(device_t parent, device_t self, void *aux)
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 @@ obio_intr_disestablish(struct obio_softc *sc, int irq, int (* func)(void *))
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

9
sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
View File

@ -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 @@ sskbd_attach(struct device *parent, struct device *self, void *aux)
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 @@ sskbd_enable(void *v, int on)
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