summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/isa/sb_isa.c15
-rw-r--r--sys/dev/isa/sb_isapnp.c6
2 files changed, 6 insertions, 15 deletions
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 9cba8d91df8..3113de89470 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb_isa.c,v 1.2 1998/04/26 21:02:57 provos Exp $ */
+/* $OpenBSD: sb_isa.c,v 1.3 1998/04/28 00:03:24 deraadt Exp $ */
/* $NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $ */
/*
@@ -108,20 +108,15 @@ sbfind(parent, sc, ia)
{
int rc = 0;
- if (!SB_BASE_VALID(ia->ia_iobase)) {
- printf("sb: configured iobase 0x%x invalid\n", ia->ia_iobase);
+ if (!SB_BASE_VALID(ia->ia_iobase))
return 0;
- }
sc->sc_iot = ia->ia_iot;
/* Map i/o space [we map 24 ports which is the max of the sb and pro */
if (bus_space_map(sc->sc_iot, ia->ia_iobase, SBP_NPORT, 0,
- &sc->sc_ioh)) {
- printf("sb: can't map i/o space 0x%x/%d in probe\n",
- ia->ia_iobase, SBP_NPORT);
+ &sc->sc_ioh))
return 0;
- }
sc->sc_iobase = ia->ia_iobase;
sc->sc_irq = ia->ia_irq;
@@ -168,10 +163,8 @@ sb_isa_attach(parent, self, aux)
if (!sbfind(parent, sc, ia) ||
bus_space_map(sc->sc_iot, ia->ia_iobase, ia->ia_iosize,
- 0, &sc->sc_ioh)) {
- printf("%s: sbfind failed\n", sc->sc_dev.dv_xname);
+ 0, &sc->sc_ioh))
return;
- }
sc->sc_isa = parent;
sbattach(sc);
}
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
index 47115e98e3d..04e704dd775 100644
--- a/sys/dev/isa/sb_isapnp.c
+++ b/sys/dev/isa/sb_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb_isapnp.c,v 1.3 1998/04/26 21:02:58 provos Exp $ */
+/* $OpenBSD: sb_isapnp.c,v 1.4 1998/04/28 00:03:25 deraadt Exp $ */
/* $NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $ */
/*
@@ -112,10 +112,8 @@ sb_isapnp_attach(parent, self, aux)
*/
sc->sc_isa = parent->dv_parent;
- if (!sbmatch(sc)) {
- printf("%s: sbmatch failed\n", sc->sc_dev.dv_xname);
+ if (!sbmatch(sc))
return;
- }
sbattach(sc);
}