summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2005-12-15 23:17:25 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2005-12-15 23:17:25 +0000
commit1e44c715721583bd1abcee4cee9a0b82fb7b38ba (patch)
treebf06459838ef6886680dc1eb5bd8459dc18d3b01 /sys/dev/ic
parentdfda486178c65b634df8f910407037d8eb8df1a4 (diff)
Fix error printf()s.
ok brad@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/smc83c170.c35
1 files changed, 16 insertions, 19 deletions
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 04bc3aa5124..d5716d6d93c 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smc83c170.c,v 1.5 2005/07/02 23:10:16 brad Exp $ */
+/* $OpenBSD: smc83c170.c,v 1.6 2005/12/15 23:17:24 krw Exp $ */
/* $NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $ */
/*-
@@ -146,9 +146,8 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
if ((error = bus_dmamem_alloc(sc->sc_dmat,
sizeof(struct epic_control_data) + ETHER_PAD_LEN, PAGE_SIZE, 0,
&seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) {
- printf(
- "%s: unable to allocate control data, error = %d\n",
- sc->sc_dev.dv_xname, error);
+ printf(": unable to allocate control data, error = %d\n",
+ error);
goto fail_0;
}
@@ -156,8 +155,7 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
sizeof(struct epic_control_data) + ETHER_PAD_LEN,
(caddr_t *)&sc->sc_control_data,
BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) {
- printf("%s: unable to map control data, error = %d\n",
- sc->sc_dev.dv_xname, error);
+ printf(": unable to map control data, error = %d\n", error);
goto fail_1;
}
nullbuf =
@@ -168,17 +166,16 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
sizeof(struct epic_control_data), 1,
sizeof(struct epic_control_data), 0, BUS_DMA_NOWAIT,
&sc->sc_cddmamap)) != 0) {
- printf("%s: unable to create control data DMA map, "
- "error = %d\n", sc->sc_dev.dv_xname, error);
+ printf(": unable to create control data DMA map, error = %d\n",
+ error);
goto fail_2;
}
if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap,
sc->sc_control_data, sizeof(struct epic_control_data), NULL,
BUS_DMA_NOWAIT)) != 0) {
- printf(
- "%s: unable to load control data DMA map, error = %d\n",
- sc->sc_dev.dv_xname, error);
+ printf(": unable to load control data DMA map, error = %d\n",
+ error);
goto fail_3;
}
@@ -189,8 +186,8 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES,
EPIC_NFRAGS, MCLBYTES, 0, BUS_DMA_NOWAIT,
&EPIC_DSTX(sc, i)->ds_dmamap)) != 0) {
- printf("%s: unable to create tx DMA map %d, "
- "error = %d\n", sc->sc_dev.dv_xname, i, error);
+ printf(": unable to create tx DMA map %d, error = %d\n",
+ i, error);
goto fail_4;
}
}
@@ -202,8 +199,8 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1,
MCLBYTES, 0, BUS_DMA_NOWAIT,
&EPIC_DSRX(sc, i)->ds_dmamap)) != 0) {
- printf("%s: unable to create rx DMA map %d, "
- "error = %d\n", sc->sc_dev.dv_xname, i, error);
+ printf(": unable to create rx DMA map %d, error = %d\n",
+ i, error);
goto fail_5;
}
EPIC_DSRX(sc, i)->ds_mbuf = NULL;
@@ -214,15 +211,15 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
*/
if ((error = bus_dmamap_create(sc->sc_dmat, ETHER_PAD_LEN, 1,
ETHER_PAD_LEN, 0, BUS_DMA_NOWAIT,&sc->sc_nulldmamap)) != 0) {
- printf("%s: unable to create pad buffer DMA map, "
- "error = %d\n", sc->sc_dev.dv_xname, error);
+ printf(": unable to create pad buffer DMA map, error = %d\n",
+ error);
goto fail_5;
}
if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_nulldmamap,
nullbuf, ETHER_PAD_LEN, NULL, BUS_DMA_NOWAIT)) != 0) {
- printf("%s: unable to load pad buffer DMA map, "
- "error = %d\n", sc->sc_dev.dv_xname, error);
+ printf(": unable to load pad buffer DMA map, error = %d\n",
+ error);
goto fail_6;
}
bus_dmamap_sync(sc->sc_dmat, sc->sc_nulldmamap, 0, ETHER_PAD_LEN,