o remove extra args in printf's.

o remove unneded struct.
o change error to match reality.

jason@ ok.

2 files changed, 11 insertions, 17 deletions

diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index 56d00a01e27..df11cdf40e1 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.17 2002/03/14 03:16:07 millert Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.18 2002/03/29 09:45:30 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -185,12 +185,6 @@ struct cgsix_softc {
     bus_space_barrier((sc)->sc_bustag, (sc)->sc_bt_regs, (reg), \
 	sizeof(u_int32_t), (flags))
 
-struct mmo {
-	u_long	mo_uaddr;		/* user (virtual address */
-	u_long	mo_size;		/* size, or 0 for video ram size */
-	u_long	mo_physoff;		/* offset from sc_physadr */
-};
-
 struct wsdisplay_emulops cgsix_emulops = {
 	rcons_cursor,
 	rcons_mapchar,
@@ -298,35 +292,35 @@ cgsixattach(parent, self, aux)
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGSIX_BT_OFFSET,
 	    CGSIX_BT_SIZE, BUS_SPACE_MAP_LINEAR, 0, &sc->sc_bt_regs) != 0) {
-		printf(": cannot map bt registers\n", self->dv_xname);
+		printf(": cannot map bt registers\n");
 		goto fail_bt;
 	}
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGSIX_FHC_OFFSET,
 	    CGSIX_FHC_SIZE, BUS_SPACE_MAP_LINEAR, 0, &sc->sc_fhc_regs) != 0) {
-		printf(": cannot map fhc registers\n", self->dv_xname);
+		printf(": cannot map fhc registers\n");
 		goto fail_fhc;
 	}
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGSIX_THC_OFFSET,
 	    CGSIX_THC_SIZE, BUS_SPACE_MAP_LINEAR, 0, &sc->sc_thc_regs) != 0) {
-		printf(": cannot map thc registers\n", self->dv_xname);
+		printf(": cannot map thc registers\n");
 		goto fail_thc;
 	}
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGSIX_VID_OFFSET,
 	    CGSIX_VID_SIZE, BUS_SPACE_MAP_LINEAR, 0, &sc->sc_vid_regs) != 0) {
-		printf(": cannot map vid registers\n", self->dv_xname);
+		printf(": cannot map vid registers\n");
 		goto fail_vid;
 	}
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGSIX_TEC_OFFSET,
 	    CGSIX_TEC_SIZE, BUS_SPACE_MAP_LINEAR, 0, &sc->sc_tec_regs) != 0) {
-		printf(": cannot map tec registers\n", self->dv_xname);
+		printf(": cannot map tec registers\n");
 		goto fail_tec;
 	}
 
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index e6bc5ef72c3..61c3b935dc8 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.13 2002/03/14 03:16:07 millert Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.14 2002/03/29 09:45:30 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -262,15 +262,15 @@ cgthreeattach(parent, self, aux)
 	    sa->sa_reg[0].sbr_offset + CGTHREE_CTRL_OFFSET,
 	    CGTHREE_CTRL_SIZE, BUS_SPACE_MAP_LINEAR,
 	    0, &sc->sc_ctrl_regs) != 0) {
-		printf(": cannot map bt registers\n", self->dv_xname);
-		goto fail_bt;
+		printf(": cannot map ctrl registers\n");
+		goto fail_ctrl;
 	}
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGTHREE_VID_OFFSET,
 	    CGTHREE_VID_SIZE, BUS_SPACE_MAP_LINEAR,
 	    0, &sc->sc_vid_regs) != 0) {
-		printf(": cannot map vid registers\n", self->dv_xname);
+		printf(": cannot map vid registers\n");
 		goto fail_vid;
 	}
 
@@ -346,7 +346,7 @@ cgthreeattach(parent, self, aux)
 
 fail_vid:
 	bus_space_unmap(sa->sa_bustag, sc->sc_ctrl_regs, CGTHREE_CTRL_SIZE);
-fail_bt:
+fail_ctrl:
 fail:
 }