9 files changed, 25 insertions, 23 deletions

diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index 1bdd9bf4e959..327292c48c3d 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -100,7 +100,7 @@ exca_read(struct exca_softc *sc, int reg)
 static __inline void
 exca_write(struct exca_softc *sc, int reg, uint8_t val)
 {
-	return (bus_space_write_1(sc->bst, sc->bsh, sc->offset + reg, val));
+	bus_space_write_1(sc->bst, sc->bsh, sc->offset + reg, val);
 }
 
 static __inline void
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 7871240c52af..6f14d9acd5d5 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -102,9 +102,9 @@ static void
 port_wr(struct resource *port, int off, u_int8_t data)
 {
 	if (port)
-		return bus_space_write_1(rman_get_bustag(port),
-					 rman_get_bushandle(port),
-					 off, data);
+		bus_space_write_1(rman_get_bustag(port),
+				  rman_get_bushandle(port),
+				  off, data);
 }
 
 static int
@@ -116,7 +116,7 @@ io_rd(struct ad1816_info *ad1816, int reg)
 static void
 io_wr(struct ad1816_info *ad1816, int reg, u_int8_t data)
 {
-	return port_wr(ad1816->io_base, reg, data);
+	port_wr(ad1816->io_base, reg, data);
 }
 
 static void
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 48b62882f353..35c4fffac80c 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -155,9 +155,9 @@ port_rd(struct resource *port, int off)
 static void
 port_wr(struct resource *port, int off, u_int8_t data)
 {
-	return bus_space_write_1(rman_get_bustag(port),
-				 rman_get_bushandle(port),
-				 off, data);
+	bus_space_write_1(rman_get_bustag(port),
+			  rman_get_bushandle(port),
+			  off, data);
 }
 
 static int
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 01d9bee820ca..42d52a788450 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -198,9 +198,9 @@ static void
 port_wr(struct resource *port, int off, u_int8_t data)
 {
 	if (port)
-		return bus_space_write_1(rman_get_bustag(port),
-					 rman_get_bushandle(port),
-					 off, data);
+		bus_space_write_1(rman_get_bustag(port),
+				  rman_get_bushandle(port),
+				  off, data);
 }
 
 static int
@@ -214,7 +214,7 @@ static void
 io_wr(struct mss_info *mss, int reg, u_int8_t data)
 {
 	if (mss->bd_flags & BD_F_MSS_OFFSET) reg -= 4;
-	return port_wr(mss->io_base, reg, data);
+	port_wr(mss->io_base, reg, data);
 }
 
 static void
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index f8d09feb620d..fa167017f6f5 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -136,7 +136,7 @@ port_rd(struct resource *port, int off)
 static void
 port_wr(struct resource *port, int off, u_int8_t data)
 {
-	return bus_space_write_1(rman_get_bustag(port), rman_get_bushandle(port), off, data);
+	bus_space_write_1(rman_get_bustag(port), rman_get_bushandle(port), off, data);
 }
 
 static int
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index be4e6708dbb7..a57671e31b5d 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -127,7 +127,7 @@ port_rd(struct resource *port, int off)
 static void
 port_wr(struct resource *port, int off, u_int8_t data)
 {
-	return bus_space_write_1(rman_get_bustag(port), rman_get_bushandle(port), off, data);
+	bus_space_write_1(rman_get_bustag(port), rman_get_bushandle(port), off, data);
 }
 
 static int
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index d57ed7eb42ca..01f451c7600c 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -146,9 +146,9 @@ sb_rd(struct resource *io, int reg)
 static void
 sb_wr(struct resource *io, int reg, u_int8_t val)
 {
-	return bus_space_write_1(rman_get_bustag(io),
-				 rman_get_bushandle(io),
-				 reg, val);
+	bus_space_write_1(rman_get_bustag(io),
+			  rman_get_bushandle(io),
+			  reg, val);
 }
 
 static int
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index 4170aeb4e053..5353b874b4e4 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -479,7 +479,7 @@ uartsio_readport(sc_p scp, int off)
 static void
 uartsio_writeport(sc_p scp, int off, u_int8_t value)
 {
-	return bus_space_write_1(rman_get_bustag(scp->io), rman_get_bushandle(scp->io), off, value);
+	bus_space_write_1(rman_get_bustag(scp->io), rman_get_bushandle(scp->io), off, value);
 }
 
 /* Allocates resources other than IO ports. */
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index aca19228e2bc..0b075394c022 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -184,15 +184,17 @@ fm801_rd(struct fm801_info *fm801, int regno, int size)
 static void
 fm801_wr(struct fm801_info *fm801, int regno, u_int32_t data, int size)
 {
+
 	switch(size) {
 	case 1:
-		return bus_space_write_1(fm801->st, fm801->sh, regno, data);
+		bus_space_write_1(fm801->st, fm801->sh, regno, data);
+		break;
 	case 2:
-		return bus_space_write_2(fm801->st, fm801->sh, regno, data);
+		bus_space_write_2(fm801->st, fm801->sh, regno, data);
+		break;
 	case 4:
-		return bus_space_write_4(fm801->st, fm801->sh, regno, data);
-	default:
-		return;
+		bus_space_write_4(fm801->st, fm801->sh, regno, data);
+		break;
 	}
 }