Module Name: src
Committed By: cegger
Date: Tue May 12 07:06:53 UTC 2009
Modified Files:
src/sys/arch/acorn32/mainbus: atppc_pioc.c
Log Message:
use device_xname(), use aprint_*_dev
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn32/mainbus/atppc_pioc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/mainbus/atppc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.4 src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.5
--- src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.4 Wed Apr 16 09:39:01 2008
+++ src/sys/arch/acorn32/mainbus/atppc_pioc.c Tue May 12 07:06:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_pioc.c,v 1.4 2008/04/16 09:39:01 cegger Exp $ */
+/* $NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -32,7 +32,7 @@
#include "opt_atppc.h"
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.4 2008/04/16 09:39:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -75,18 +75,18 @@
return 0;
if (pa->pa_offset == PIOCCF_OFFSET_DEFAULT) {
- aprint_error("%s(%s): io port unknown.\n", __func__,
- parent->dv_xname);
+ aprint_error_dev(parent, "(%s): io port unknown.\n", __func__);
} else if (bus_space_map(iot, addr, IO_LPTSIZE, 0, &ioh) == 0) {
if (atppc_detect_port(iot, ioh) == 0)
rval = 1;
else
- aprint_error("%s(%s): unable to write/read I/O "
- "port.\n", __func__, parent->dv_xname);
+ aprint_error_dev(parent,
+ "(%s): unable to write/read I/O port.\n",
+ __func__);
bus_space_unmap(iot, ioh, IO_LPTSIZE);
} else {
- aprint_error("%s(%s): attempt to map bus space failed.\n",
- __func__, parent->dv_xname);
+ aprint_error_dev(parent, "(%s): attempt to map bus space failed.\n",
+ __func__);
}
return rval;
@@ -123,10 +123,10 @@
sc->sc_has |= ATPPC_HAS_INTR;
} else
ATPPC_DPRINTF(("%s: IRQ not assigned or bad number of "
- "IRQs.\n", self->dv_xname));
+ "IRQs.\n", device_xname(self)));
} else
ATPPC_VPRINTF(("%s: interrupts not configured due to flags.\n",
- self->dv_xname));
+ device_xname(self)));
/* Run soft configuration attach */
atppc_sc_attach(sc);
