ansi

35 files changed, 320 insertions, 816 deletions

diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index 6eb97fce07a..49c199f64fc 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ad1848var.h,v 1.15 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: ad1848var.h,v 1.16 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $	*/
 
 /*
@@ -136,9 +136,7 @@ static __inline int ad1848_to_vol(mixer_ctrl_t *, struct ad1848_volume *);
 static __inline int ad1848_from_vol(mixer_ctrl_t *, struct ad1848_volume *);
 
 static __inline int
-ad1848_to_vol(cp, vol)
-	mixer_ctrl_t *cp;
-	struct ad1848_volume *vol;
+ad1848_to_vol(mixer_ctrl_t *cp, struct ad1848_volume *vol)
 {
 	if (cp->un.value.num_channels == 1) {
 		vol->left = vol->right = cp->un.value.level[AUDIO_MIXER_LEVEL_MONO];
@@ -153,9 +151,7 @@ ad1848_to_vol(cp, vol)
 }
 
 static __inline int
-ad1848_from_vol(cp, vol)
-	mixer_ctrl_t *cp;
-	struct ad1848_volume *vol;
+ad1848_from_vol(mixer_ctrl_t *cp, struct ad1848_volume *vol)
 {
 	if (cp->un.value.num_channels == 1) {
 		cp->un.value.level[AUDIO_MIXER_LEVEL_MONO] = vol->left;
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 576f6072915..47d315d43fc 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_isa.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: aic_isa.c,v 1.9 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 /*
@@ -88,9 +88,7 @@ struct cfattach aic_isa_ca = {
  * returns non-zero value if a controller is found.
  */
 int
-aic_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+aic_isa_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
@@ -116,9 +114,7 @@ aic_isa_probe(parent, match, aux)
  * Attach the AIC6360, fill out some high and low level data structures
  */
 void
-aic_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+aic_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
@@ -138,4 +134,3 @@ aic_isa_attach(parent, self, aux)
 
 	aicattach(sc);
 }
-
diff --git a/sys/dev/isa/aic_isapnp.c b/sys/dev/isa/aic_isapnp.c
index ec1a20444ed..eff8697555f 100644
--- a/sys/dev/isa/aic_isapnp.c
+++ b/sys/dev/isa/aic_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_isapnp.c,v 1.1 2002/09/03 16:30:55 mickey Exp $	*/
+/*	$OpenBSD: aic_isapnp.c,v 1.2 2021/03/07 06:17:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Anders Arnholm
@@ -63,9 +63,7 @@ struct cfattach aic_isapnp_ca = {
  *		     and other configured card are found by aic_isa_match
  */
 int
-aic_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+aic_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	AIC_TRACE(("aic: aic_isapnp_match\n"));
 	return(1);
@@ -75,9 +73,7 @@ aic_isapnp_match(parent, match, aux)
  * Attach the AIC6360, takes the data from isapnp and feads into aicattach.
  */
 void
-aic_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+aic_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct aic_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 20a498c404f..40d776f745d 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.18 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: ast.c,v 1.19 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $	*/
 
 /*
@@ -74,10 +74,7 @@ struct cfdriver ast_cd = {
 };
 
 int
-astprobe(parent, self, aux)
-	struct device *parent;
-	void *self;
-	void *aux;
+astprobe(struct device *parent, void *self, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	int iobase = ia->ia_iobase;
@@ -126,9 +123,7 @@ out:
 }
 
 int
-astprint(aux, pnp)
-	void *aux;
-	const char *pnp;
+astprint(void *aux, const char *pnp)
 {
 	struct commulti_attach_args *ca = aux;
 
@@ -139,9 +134,7 @@ astprint(aux, pnp)
 }
 
 void
-astattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+astattach(struct device *parent, struct device *self, void *aux)
 {
 	struct ast_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
@@ -180,8 +173,7 @@ astattach(parent, self, aux)
 }
 
 int
-astintr(arg)
-	void *arg;
+astintr(void *arg)
 {
 	struct ast_softc *sc = arg;
 	bus_space_tag_t iot = sc->sc_iot;
diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c
index 2c3271a62b7..4b4a56dc3b9 100644
--- a/sys/dev/isa/cy_isa.c
+++ b/sys/dev/isa/cy_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cy_isa.c,v 1.9 2002/09/15 21:30:25 art Exp $	*/
+/*	$OpenBSD: cy_isa.c,v 1.10 2021/03/07 06:17:03 jsg Exp $	*/
 /*
  * Copyright (c) 1996 Timo Rossi.
  * All rights reserved.
@@ -57,9 +57,7 @@ struct cfattach cy_isa_ca = {
 };
 
 int
-cy_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+cy_isa_probe(struct device *parent, void *match, void *aux)
 {
 	int card = ((struct device *)match)->dv_unit;
 	struct isa_attach_args *ia = aux;
@@ -87,9 +85,7 @@ cy_isa_probe(parent, match, aux)
 }
 
 void
-cy_isa_attach(parent, self, aux)
-        struct device *parent, *self;
-        void *aux;
+cy_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct cy_softc *sc = (struct cy_softc *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 3dbdf2f00b3..b146a658cc0 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ess.c,v 1.24 2016/09/19 06:46:44 ratchov Exp $	*/
+/*	$OpenBSD: ess.c,v 1.25 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $	*/
 
 /*
@@ -2114,10 +2114,7 @@ ess_reset(struct ess_softc *sc)
 }
 
 void
-ess_set_gain(sc, port, on)
-	struct ess_softc *sc;
-	int port;
-	int on;
+ess_set_gain(struct ess_softc *sc, int port, int on)
 {
 	int gain, left, right;
 	int mix;
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 67b1b88698a..32dc84502d7 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus.c,v 1.47 2018/07/30 14:19:12 kettenis Exp $	*/
+/*	$OpenBSD: gus.c,v 1.48 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -1509,9 +1509,7 @@ gusmax_round_blocksize(void *addr, int blocksize)
 }
 
 int
-gus_round_blocksize(addr, blocksize)
-	void * addr;
-	int blocksize;
+gus_round_blocksize(void *addr, int blocksize)
 {
 	struct gus_softc *sc = addr;
 
diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c
index 7aec5616f08..f4b321032b5 100644
--- a/sys/dev/isa/gus_isa.c
+++ b/sys/dev/isa/gus_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isa.c,v 1.7 2015/05/12 16:35:23 ratchov Exp $	*/
+/*	$OpenBSD: gus_isa.c,v 1.8 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -131,10 +131,7 @@ struct cfattach gus_isa_ca = {
 };
 
 int
-gus_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+gus_isa_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	int iobase = ia->ia_iobase;
@@ -191,9 +188,7 @@ done:
  */
 
 void
-gus_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+gus_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct gus_softc *sc = (void *) self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c
index 9e92c7472c3..fc5b9a38a7c 100644
--- a/sys/dev/isa/gus_isapnp.c
+++ b/sys/dev/isa/gus_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isapnp.c,v 1.8 2015/05/12 16:35:23 ratchov Exp $	*/
+/*	$OpenBSD: gus_isapnp.c,v 1.9 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -130,17 +130,13 @@ struct cfattach gus_isapnp_ca = {
  * Probe for the GUS hardware.
  */
 int
-gus_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+gus_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	return 1;
 }
 
 void
-gus_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+gus_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct gus_softc *sc = (void *) self;
 	struct isa_attach_args *ipa = aux;
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 791c0f85244..b46be330451 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isa.c,v 1.23 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: i82365_isa.c,v 1.24 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -84,9 +84,7 @@ static struct pcmcia_chip_functions pcic_isa_functions = {
 };
 
 int
-pcic_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+pcic_isa_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t memt = ia->ia_memt, iot = ia->ia_iot;
@@ -150,9 +148,7 @@ pcic_isa_probe(parent, match, aux)
 }
 
 void
-pcic_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pcic_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct pcic_softc *sc = (void *)self;
 	struct pcic_handle *h;
diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c
index 1acbf393471..39430ce7c23 100644
--- a/sys/dev/isa/i82365_isapnp.c
+++ b/sys/dev/isa/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isapnp.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
+/*	$OpenBSD: i82365_isapnp.c,v 1.10 2021/03/07 06:17:03 jsg Exp $ */
 /*	$NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $	*/
 
 /*
@@ -90,18 +90,13 @@ static struct pcmcia_chip_functions pcic_isa_functions = {
 };
 
 int
-pcic_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+pcic_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	return (1);
 }
 
 void
-pcic_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pcic_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct pcic_softc *sc = (void *) self;
 	struct pcic_handle *h;
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index a1cb52ecd5a..fb66caaad52 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isasubr.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: i82365_isasubr.c,v 1.26 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $  */
 
 /*
@@ -105,12 +105,8 @@ int	pcicsubr_debug = 1 /* XXX */ ;
 static int pcic_intr_seen;
 
 void
-pcic_isa_bus_width_probe(sc, iot, ioh, base, length)
-	struct pcic_softc *sc;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	bus_addr_t base;
-	u_int32_t length;
+pcic_isa_bus_width_probe(struct pcic_softc *sc, bus_space_tag_t iot,
+    bus_space_handle_t ioh, bus_addr_t base, u_int32_t length)
 {
 	bus_space_handle_t ioh_high;
 	int i, iobuswidth, tmp1, tmp2;
@@ -181,13 +177,9 @@ pcic_isa_bus_width_probe(sc, iot, ioh, base, length)
 
 
 void *
-pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
-	pcmcia_chipset_handle_t pch;
-	struct pcmcia_function *pf;
-	int ipl;
-	int (*fct)(void *);
-	void *arg;
-	char *xname;
+pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t pch,
+    struct pcmcia_function *pf, int ipl, int (*fct)(void *), void *arg,
+    char *xname)
 {
 	struct pcic_handle *h = (struct pcic_handle *)pch;
 	struct pcic_softc *sc = (struct pcic_softc *)(h->ph_parent);
@@ -215,9 +207,7 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 }
 
 void 
-pcic_isa_chip_intr_disestablish(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t pch, void *ih)
 {
 	struct pcic_handle *h = (struct pcic_handle *) pch;
 	struct pcic_softc *sc = (struct pcic_softc *)(h->ph_parent);
@@ -234,9 +224,7 @@ pcic_isa_chip_intr_disestablish(pch, ih)
 }
 
 const char *
-pcic_isa_chip_intr_string(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+pcic_isa_chip_intr_string(pcmcia_chipset_handle_t pch, void *ih)
 {
 	struct pcic_handle *h = (struct pcic_handle *)pch;
 	static char irqstr[64];
@@ -249,8 +237,7 @@ pcic_isa_chip_intr_string(pch, ih)
 }
 
 int
-pcic_intr_probe(v)
-	void *v;
+pcic_intr_probe(void *v)
 {
 	pcic_intr_seen = 1;
 	return (1);
@@ -264,9 +251,7 @@ pcic_intr_probe(v)
  * tickling just assuming the first usable irq found works.
  */
 int
-pcic_intr_find(sc, ist)
-	struct pcic_softc *sc;
-	int ist;
+pcic_intr_find(struct pcic_softc *sc, int ist)
 {
 	struct pcic_handle *ph = &sc->handle[0];
 	isa_chipset_tag_t ic = sc->intr_est;
diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c
index 009a9819374..d854402d619 100644
--- a/sys/dev/isa/ics2101.c
+++ b/sys/dev/isa/ics2101.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ics2101.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */
+/* $OpenBSD: ics2101.c,v 1.10 2021/03/07 06:17:03 jsg Exp $ */
 /* $NetBSD: ics2101.c,v 1.6 1997/10/09 07:57:23 jtc Exp $ */
 
 /*-
@@ -67,9 +67,8 @@ static void ics2101_mix_doit(struct ics2101_softc *, u_int, u_int, u_int,
 
 
 static void
-ics2101_mix_doit(sc, chan, side, value, flags)
-	struct ics2101_softc *sc;
-	u_int chan, side, value, flags;
+ics2101_mix_doit(struct ics2101_softc *sc, u_int chan, u_int side, u_int value,
+    u_int flags)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	unsigned char flip_left[6] = {0x01, 0x01, 0x01, 0x02, 0x01, 0x02};
@@ -129,18 +128,16 @@ ics2101_mix_doit(sc, chan, side, value, flags)
 }
 
 void
-ics2101_mix_mute(sc, chan, side, domute)
-	struct ics2101_softc *sc;
-	unsigned int chan, side, domute;
+ics2101_mix_mute(struct ics2101_softc *sc, unsigned int chan, unsigned int side,
+    unsigned int domute)
 {
     ics2101_mix_doit(sc, chan, side, 0,
 		     domute ? ICS_MUTE|ICS_MUTE_MUTED : ICS_MUTE);
 }
 
 void
-ics2101_mix_attenuate(sc, chan, side, value)
-	struct ics2101_softc *sc;
-	unsigned int chan, side, value;
+ics2101_mix_attenuate(struct ics2101_softc *sc, unsigned int chan,
+    unsigned int side, unsigned int value)
 {
     ics2101_mix_doit(sc, chan, side, value, ICS_VALUE);
 }
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index c1f029b73c2..b85cf17a234 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.39 2017/01/22 10:17:38 dlg Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.40 2021/03/07 06:17:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -134,17 +134,13 @@ struct cfattach ef_isapnp_ca = {
 };
 
 int
-ef_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ef_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	return (1);
 }
 
 void
-ef_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+ef_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ef_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
@@ -224,8 +220,7 @@ ef_isapnp_attach(parent, self, aux)
 }
 
 void
-efstart(ifp)
-	struct ifnet *ifp;
+efstart(struct ifnet *ifp)
 {
 	struct ef_softc *sc = ifp->if_softc;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -324,10 +319,7 @@ startagain:
 }
 
 int
-efioctl(ifp, cmd, data)
-	struct ifnet *ifp;
-	u_long cmd;
-	caddr_t data;
+efioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ef_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
@@ -373,8 +365,7 @@ efioctl(ifp, cmd, data)
 }
 
 void
-efinit(sc)
-	struct ef_softc *sc;
+efinit(struct ef_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -445,8 +436,7 @@ efinit(sc)
 }
 
 void
-efreset(sc)
-	struct ef_softc *sc;
+efreset(struct ef_softc *sc)
 {
 	int s;
 
@@ -457,8 +447,7 @@ efreset(sc)
 }
 
 void
-efstop(sc)
-	struct ef_softc *sc;
+efstop(struct ef_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -486,9 +475,7 @@ efstop(sc)
 }
 
 void
-efcompletecmd(sc, cmd, arg)
-	struct ef_softc *sc;
-	u_int cmd, arg;
+efcompletecmd(struct ef_softc *sc, u_int cmd, u_int arg)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -499,8 +486,7 @@ efcompletecmd(sc, cmd, arg)
 }
 
 int
-efintr(vsc)
-	void *vsc;
+efintr(void *vsc)
 {
 	struct ef_softc *sc = vsc;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -546,8 +532,7 @@ efintr(vsc)
 }
 
 void
-eftxstat(sc)
-	struct ef_softc *sc;
+eftxstat(struct ef_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -591,8 +576,7 @@ eftxstat(sc)
 }
 
 int
-efbusyeeprom(sc)
-	struct ef_softc *sc;
+efbusyeeprom(struct ef_softc *sc)
 {
 	int i = 100, j;
 
@@ -614,8 +598,7 @@ efbusyeeprom(sc)
 }
 
 void
-efwatchdog(ifp)
-	struct ifnet *ifp;
+efwatchdog(struct ifnet *ifp)
 {
 	struct ef_softc *sc = ifp->if_softc;
 
@@ -625,8 +608,7 @@ efwatchdog(ifp)
 }
 
 void
-efsetmulti(sc)
-	struct ef_softc *sc;
+efsetmulti(struct ef_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	struct arpcom *ac = &sc->sc_arpcom;
@@ -652,8 +634,7 @@ efsetmulti(sc)
 }
 
 void
-efread(sc)
-	struct ef_softc *sc;
+efread(struct ef_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -711,9 +692,7 @@ efread(sc)
 }
 
 struct mbuf *
-efget(sc, totlen)
-	struct ef_softc *sc;
-	int totlen;
+efget(struct ef_softc *sc, int totlen)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -781,9 +760,7 @@ efget(sc, totlen)
 	    & (~(x)))
 
 void
-ef_mii_writeb(sc, b)
-	struct ef_softc *sc;
-	int b;
+ef_mii_writeb(struct ef_softc *sc, int b)
 {
 	MII_CLR(sc, EF_MII_CLK);
 
@@ -799,8 +776,7 @@ ef_mii_writeb(sc, b)
 }
 
 void
-ef_mii_sync(sc)
-	struct ef_softc *sc;
+ef_mii_sync(struct ef_softc *sc)
 {
 	int i;
 
@@ -809,9 +785,7 @@ ef_mii_sync(sc)
 }
 
 int
-ef_miibus_readreg(dev, phy, reg)
-	struct device *dev;
-	int phy, reg;
+ef_miibus_readreg(struct device *dev, int phy, int reg)
 {
 	struct ef_softc *sc = (struct ef_softc *)dev;
 	int i, ack, s, val = 0;
@@ -882,9 +856,7 @@ ef_miibus_readreg(dev, phy, reg)
 }
 
 void
-ef_miibus_writereg(dev, phy, reg, val)
-	struct device *dev;
-	int phy, reg, val;
+ef_miibus_writereg(struct device *dev, int phy, int reg, int val)
 {
 	struct ef_softc *sc = (struct ef_softc *)dev;
 	int s, i;
@@ -920,8 +892,7 @@ ef_miibus_writereg(dev, phy, reg, val)
 }
 
 int
-ef_ifmedia_upd(ifp)
-	struct ifnet *ifp;
+ef_ifmedia_upd(struct ifnet *ifp)
 {
 	struct ef_softc *sc = ifp->if_softc;
 
@@ -930,9 +901,7 @@ ef_ifmedia_upd(ifp)
 }
 
 void
-ef_ifmedia_sts(ifp, ifmr)
-	struct ifnet *ifp;
-	struct ifmediareq *ifmr;
+ef_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
 	struct ef_softc *sc = ifp->if_softc;
 
@@ -942,8 +911,7 @@ ef_ifmedia_sts(ifp, ifmr)
 }
 
 void
-ef_miibus_statchg(self)
-	struct device *self;
+ef_miibus_statchg(struct device *self)
 {
 	struct ef_softc *sc = (struct ef_softc *)self;
 	int s;
@@ -962,8 +930,7 @@ ef_miibus_statchg(self)
 }
 
 void
-ef_tick(v)
-	void *v;
+ef_tick(void *v)
 {
 	struct ef_softc *sc = v;
 	int s;
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 7f5b058e0de..40904e5893f 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.35 2020/07/10 13:22:20 patrick Exp $       */
+/*    $OpenBSD: if_el.c,v 1.36 2021/03/07 06:17:03 jsg Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -97,9 +97,7 @@ struct cfdriver el_cd = {
  * (XXX - cgd -- needs help)
  */
 int
-elprobe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+elprobe(struct device *parent, void *match, void *aux)
 {
 	struct el_softc *sc = match;
 	struct isa_attach_args *ia = aux;
@@ -159,9 +157,7 @@ elprobe(parent, match, aux)
  * assume that the IRQ given is correct.
  */
 void
-elattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+elattach(struct device *parent, struct device *self, void *aux)
 {
 	struct el_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
@@ -198,8 +194,7 @@ elattach(parent, self, aux)
  * Reset interface.
  */
 void
-elreset(sc)
-	struct el_softc *sc;
+elreset(struct el_softc *sc)
 {
 	int s;
 
@@ -214,8 +209,7 @@ elreset(sc)
  * Stop interface.
  */
 void
-elstop(sc)
-	struct el_softc *sc;
+elstop(struct el_softc *sc)
 {
 
 	outb(sc->sc_iobase+EL_AC, 0);
@@ -226,8 +220,7 @@ elstop(sc)
  * case the board forgets.
  */
 static inline void
-el_hardreset(sc)
-	struct el_softc *sc;
+el_hardreset(struct el_softc *sc)
 {
 	int iobase = sc->sc_iobase;
 	int i;
@@ -244,8 +237,7 @@ el_hardreset(sc)
  * Initialize interface.
  */
 void
-elinit(sc)
-	struct el_softc *sc;
+elinit(struct el_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	int iobase = sc->sc_iobase;
@@ -283,8 +275,7 @@ elinit(sc)
  * interrupt level!
  */
 void
-elstart(ifp)
-	struct ifnet *ifp;
+elstart(struct ifnet *ifp)
 {
 	struct el_softc *sc = ifp->if_softc;
 	int iobase = sc->sc_iobase;
@@ -392,8 +383,7 @@ elstart(ifp)
  * success, non-0 on failure.
  */
 static int
-el_xmit(sc)
-	struct el_softc *sc;
+el_xmit(struct el_softc *sc)
 {
 	int iobase = sc->sc_iobase;
 	int i;
@@ -421,8 +411,7 @@ el_xmit(sc)
  * Controller interrupt.
  */
 int
-elintr(arg)
-	void *arg;
+elintr(void *arg)
 {
 	register struct el_softc *sc = arg;
 	int iobase = sc->sc_iobase;
@@ -481,9 +470,7 @@ elintr(arg)
  * Pass a packet to the higher levels.
  */
 void
-elread(sc, len)
-	register struct el_softc *sc;
-	int len;
+elread(struct el_softc *sc, int len)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	struct mbuf_list ml = MBUF_LIST_INITIALIZER();
@@ -514,9 +501,7 @@ elread(sc, len)
  * units are present we copy into clusters.
  */
 struct mbuf *
-elget(sc, totlen)
-	struct el_softc *sc;
-	int totlen;
+elget(struct el_softc *sc, int totlen)
 {
 	int iobase = sc->sc_iobase;
 	struct mbuf *top, **mp, *m;
@@ -564,10 +549,7 @@ elget(sc, totlen)
  * Process an ioctl request. This code needs some work - it looks pretty ugly.
  */
 int
-elioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
-	u_long cmd;
-	caddr_t data;
+elioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct el_softc *sc = ifp->if_softc;
 	int s, error = 0;
@@ -617,8 +599,7 @@ elioctl(ifp, cmd, data)
  * Device timeout routine.
  */
 void
-elwatchdog(ifp)
-	struct ifnet *ifp;
+elwatchdog(struct ifnet *ifp)
 {
 	struct el_softc *sc = ifp->if_softc;
 
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 57ff5ffaf7a..3f4264cb9b0 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.56 2020/07/10 13:22:20 patrick Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.57 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -323,9 +323,8 @@ struct cfdriver ie_cd = {
  * since we have the inline facility, it makes sense to use that instead.
  */
 static __inline void
-ie_setup_config(cmd, promiscuous, manchester)
-	volatile struct ie_config_cmd *cmd;
-	int promiscuous, manchester;
+ie_setup_config(volatile struct ie_config_cmd *cmd, int promiscuous,
+    int manchester)
 {
 
 	cmd->ie_config_count = 0x0c;
@@ -343,9 +342,7 @@ ie_setup_config(cmd, promiscuous, manchester)
 }
 
 static __inline void
-ie_ack(sc, mask)
-	struct ie_softc *sc;
-	u_int mask;
+ie_ack(struct ie_softc *sc, u_int mask)
 {
 	volatile struct ie_sys_ctl_block *scb = sc->scb;
 
@@ -357,9 +354,7 @@ ie_ack(sc, mask)
 }
 
 int
-ieprobe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ieprobe(struct device *parent, void *match, void *aux)
 {
 	struct ie_softc *sc = match;
 	struct isa_attach_args *ia = aux;
@@ -374,9 +369,7 @@ ieprobe(parent, match, aux)
 }
 
 int
-sl_probe(sc, ia)
-	struct ie_softc *sc;
-	struct isa_attach_args *ia;
+sl_probe(struct ie_softc *sc, struct isa_attach_args *ia)
 {
 	u_char c;
 
@@ -441,9 +434,7 @@ sl_probe(sc, ia)
 }
 
 int
-el_probe(sc, ia)
-	struct ie_softc *sc;
-	struct isa_attach_args *ia;
+el_probe(struct ie_softc *sc, struct isa_attach_args *ia)
 {
 	bus_space_tag_t iot = ia->ia_iot;
 	bus_space_handle_t ioh;
@@ -560,9 +551,7 @@ el_probe(sc, ia)
 /* Taken almost exactly from Rod's if_ix.c. */
 
 int
-ee16_probe(sc, ia)
-	struct ie_softc *sc;
-	struct isa_attach_args *ia;
+ee16_probe(struct ie_softc *sc, struct isa_attach_args *ia)
 {
 	int i;
 	u_short board_id, id_var1, id_var2, checksum = 0;
@@ -760,9 +749,7 @@ ee16_probe(sc, ia)
  * Taken almost exactly from Bill's if_is.c, then modified beyond recognition.
  */
 void
-ieattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+ieattach(struct device *parent, struct device *self, void *aux)
 {
 	struct ie_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
@@ -793,8 +780,7 @@ ieattach(parent, self, aux)
  * an interrupt after a transmit has been started on it.
  */
 void
-iewatchdog(ifp)
-	struct ifnet *ifp;
+iewatchdog(struct ifnet *ifp)
 {
 	struct ie_softc *sc = ifp->if_softc;
 
@@ -807,8 +793,7 @@ iewatchdog(ifp)
  * What to do upon receipt of an interrupt.
  */
 int
-ieintr(arg)
-	void *arg;
+ieintr(void *arg)
 {
 	struct ie_softc *sc = arg;
 	register u_short status;
@@ -883,8 +868,7 @@ loop:
  * Process a received-frame interrupt.
  */
 void
-ierint(sc)
-	struct ie_softc *sc;
+ierint(struct ie_softc *sc)
 {
 	volatile struct ie_sys_ctl_block *scb = sc->scb;
 	int i, status;
@@ -925,8 +909,7 @@ ierint(sc)
  * the real work is done by iestart().
  */
 void
-ietint(sc)
-	struct ie_softc *sc;
+ietint(struct ie_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	int status;
@@ -990,8 +973,7 @@ ietint(sc)
  * speed.  I'd love to have an inline assembler version of this...
  */
 static __inline int
-ether_equal(one, two)
-	u_char *one, *two;
+ether_equal(u_char *one, u_char *two)
 {
 
 	if (one[0] != two[0] || one[1] != two[1] || one[2] != two[2] ||
@@ -1005,9 +987,7 @@ ether_equal(one, two)
  * Return value is true if the packet is for us, and false otherwise.
  */
 static __inline int
-check_eh(sc, eh)
-	struct ie_softc *sc;
-	struct ether_header *eh;
+check_eh(struct ie_softc *sc, struct ether_header *eh)
 {
 	int i;
 
@@ -1072,9 +1052,7 @@ check_eh(sc, eh)
  * the size of the buffer, then we are screwed anyway.
  */
 static __inline int
-ie_buflen(sc, head)
-	struct ie_softc *sc;
-	int head;
+ie_buflen(struct ie_softc *sc, int head)
 {
 
 	return (sc->rbuffs[head]->ie_rbd_actual
@@ -1082,8 +1060,7 @@ ie_buflen(sc, head)
 }
 
 static __inline int
-ie_packet_len(sc)
-	struct ie_softc *sc;
+ie_packet_len(struct ie_softc *sc)
 {
 	int i;
 	int head = sc->rbhead;
@@ -1108,8 +1085,7 @@ ie_packet_len(sc)
  * also give him a copy.
  */
 void
-iexmit(sc)
-	struct ie_softc *sc;
+iexmit(struct ie_softc *sc)
 {
 
 #ifdef IEDEBUG
@@ -1148,9 +1124,7 @@ iexmit(sc)
  * that it works, of course.)
  */
 struct mbuf *
-ieget(sc, ehp)
-	struct ie_softc *sc;
-	struct ether_header *ehp;
+ieget(struct ie_softc *sc, struct ether_header *ehp)
 {
 	struct mbuf *top, **mp, *m;
 	int len, totlen, resid;
@@ -1268,9 +1242,7 @@ ieget(sc, ehp)
  * for trailers anyway.
  */
 void
-ie_readframe(sc, num)
-	struct ie_softc *sc;
-	int num;			/* frame number to read */
+ie_readframe(struct ie_softc *sc, int num)	/* frame number to read */
 {
 	int status;
 	struct mbuf *m = NULL;
@@ -1305,8 +1277,7 @@ ie_readframe(sc, num)
 }
 
 void
-ie_drop_packet_buffer(sc)
-	struct ie_softc *sc;
+ie_drop_packet_buffer(struct ie_softc *sc)
 {
 	int i;
 
@@ -1339,8 +1310,7 @@ ie_drop_packet_buffer(sc)
  * Start transmission on an interface.
  */
 void
-iestart(ifp)
-	struct ifnet *ifp;
+iestart(struct ifnet *ifp)
 {
 	struct ie_softc *sc = ifp->if_softc;
 	struct mbuf *m0, *m;
@@ -1411,10 +1381,7 @@ iestart(ifp)
  * Check to see if there's an 82586 out there.
  */
 int
-check_ie_present(sc, where, size)
-	struct ie_softc *sc;
-	caddr_t where;
-	u_int size;
+check_ie_present(struct ie_softc *sc, caddr_t where, u_int size)
 {
 	volatile struct ie_sys_conf_ptr *scp;
 	volatile struct ie_int_sys_conf_ptr *iscp;
@@ -1500,8 +1467,7 @@ check_ie_present(sc, where, size)
  * Better hope there's nothing important hiding just below the ie card...
  */
 void
-ie_find_mem_size(sc)
-	struct ie_softc *sc;
+ie_find_mem_size(struct ie_softc *sc)
 {
 	u_int size;
 
@@ -1515,8 +1481,7 @@ ie_find_mem_size(sc)
 }
 
 void
-el_reset_586(sc)
-	struct ie_softc *sc;
+el_reset_586(struct ie_softc *sc)
 {
 
 	outb(PORT + IE507_CTRL, EL_CTRL_RESET);
@@ -1526,16 +1491,14 @@ el_reset_586(sc)
 }
 
 void
-sl_reset_586(sc)
-	struct ie_softc *sc;
+sl_reset_586(struct ie_softc *sc)
 {
 
 	outb(PORT + IEATT_RESET, 0);
 }
 
 void
-ee16_reset_586(sc)
-	struct ie_softc *sc;
+ee16_reset_586(struct ie_softc *sc)
 {
 
 	outb(PORT + IEE16_ECTRL, IEE16_RESET_586);
@@ -1545,32 +1508,27 @@ ee16_reset_586(sc)
 }
 
 void
-el_chan_attn(sc)
-	struct ie_softc *sc;
+el_chan_attn(struct ie_softc *sc)
 {
 
 	outb(PORT + IE507_ATTN, 1);
 }
 
 void
-sl_chan_attn(sc)
-	struct ie_softc *sc;
+sl_chan_attn(struct ie_softc *sc)
 {
 
 	outb(PORT + IEATT_ATTN, 0);
 }
 
 void
-ee16_chan_attn(sc)
-	struct ie_softc *sc;
+ee16_chan_attn(struct ie_softc *sc)
 {
 	outb(PORT + IEE16_ATTN, 0);
 }
 
 u_short
-ee16_read_eeprom(sc, location)
-	struct ie_softc *sc;
-	int location;
+ee16_read_eeprom(struct ie_softc *sc, int location)
 {
 	int ectrl, edata;
 
@@ -1591,9 +1549,7 @@ ee16_read_eeprom(sc, location)
 }
 
 void
-ee16_eeprom_outbits(sc, edata, count)
-	struct ie_softc *sc;
-	int edata, count;
+ee16_eeprom_outbits(struct ie_softc *sc, int edata, int count)
 {
 	int ectrl, i;
 
@@ -1615,8 +1571,7 @@ ee16_eeprom_outbits(sc, edata, count)
 }
 
 int
-ee16_eeprom_inbits(sc)
-	struct ie_softc *sc;
+ee16_eeprom_inbits(struct ie_softc *sc)
 {
 	int ectrl, edata, i;
 
@@ -1635,9 +1590,7 @@ ee16_eeprom_inbits(sc)
 }
 
 void
-ee16_eeprom_clock(sc, state)
-	struct ie_softc *sc;
-	int state;
+ee16_eeprom_clock(struct ie_softc *sc, int state)
 {
 	int ectrl;
 
@@ -1651,16 +1604,15 @@ ee16_eeprom_clock(sc, state)
 }
 
 static inline void
-ee16_interrupt_enable(sc)
-	struct ie_softc *sc;
+ee16_interrupt_enable(struct ie_softc *sc)
 {
 	delay(100);
 	outb(PORT + IEE16_IRQ, sc->irq_encoded | IEE16_IRQ_ENABLE);
 	delay(100);
 }
+
 void
-slel_get_address(sc)
-	struct ie_softc *sc;
+slel_get_address(struct ie_softc *sc)
 {
 	u_char *addr = sc->sc_arpcom.ac_enaddr;
 	int i;
@@ -1670,8 +1622,7 @@ slel_get_address(sc)
 }
 
 void
-iereset(sc)
-	struct ie_softc *sc;
+iereset(struct ie_softc *sc)
 {
 	int s = splnet();
 
@@ -1700,11 +1651,7 @@ iereset(sc)
  * to become true.
  */
 static int
-command_and_wait(sc, cmd, pcmd, mask)
-	struct ie_softc *sc;
-	int cmd;
-	volatile void *pcmd;
-	int mask;
+command_and_wait(struct ie_softc *sc, int cmd, volatile void *pcmd, int mask)
 {
 	volatile struct ie_cmd_common *cc = pcmd;
 	volatile struct ie_sys_ctl_block *scb = sc->scb;
@@ -1747,9 +1694,7 @@ command_and_wait(sc, cmd, pcmd, mask)
  * Run the time-domain reflectometer.
  */
 static void
-run_tdr(sc, cmd)
-	struct ie_softc *sc;
-	struct ie_tdr_cmd *cmd;
+run_tdr(struct ie_softc *sc, struct ie_tdr_cmd *cmd)
 {
 	int result;
 
@@ -1793,9 +1738,7 @@ run_tdr(sc, cmd)
  * Here is a helper routine for ieinit().  This sets up the buffers.
  */
 void
-iememinit(ptr, sc)
-	void *ptr;
-	struct ie_softc *sc;
+iememinit(void *ptr, struct ie_softc *sc)
 {
 	int i;
 
@@ -1867,9 +1810,7 @@ iememinit(ptr, sc)
  * Called at splnet().
  */
 static int
-mc_setup(sc, ptr)
-	struct ie_softc *sc;
-	void *ptr;
+mc_setup(struct ie_softc *sc, void *ptr)
 {
 	volatile struct ie_mcast_cmd *cmd = ptr;
 
@@ -1901,8 +1842,7 @@ mc_setup(sc, ptr)
  * THIS ROUTINE MUST BE CALLED AT splnet() OR HIGHER.
  */
 int
-ieinit(sc)
-	struct ie_softc *sc;
+ieinit(struct ie_softc *sc)
 {
 	volatile struct ie_sys_ctl_block *scb = sc->scb;
 	void *ptr;
@@ -1993,18 +1933,14 @@ ieinit(sc)
 }
 
 void
-iestop(sc)
-	struct ie_softc *sc;
+iestop(struct ie_softc *sc)
 {
 
 	command_and_wait(sc, IE_RU_DISABLE, 0, 0);
 }
 
 int
-ieioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
-	u_long cmd;
-	caddr_t data;
+ieioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ie_softc *sc = ifp->if_softc;
 	int s, error = 0;
@@ -2065,8 +2001,7 @@ ieioctl(ifp, cmd, data)
 }
 
 static void
-mc_reset(sc)
-	struct ie_softc *sc;
+mc_reset(struct ie_softc *sc)
 {
 	struct arpcom *ac = &sc->sc_arpcom;
 	struct ether_multi *enm;
@@ -2099,8 +2034,7 @@ setflag:
 
 #ifdef IEDEBUG
 void
-print_rbd(rbd)
-	volatile struct ie_recv_buf_desc *rbd;
+print_rbd(volatile struct ie_recv_buf_desc *rbd)
 {
 
 	printf("RBD at %08lx:\nactual %04x, next %04x, buffer %08x\n"
@@ -2109,4 +2043,3 @@ print_rbd(rbd)
 	    rbd->mbz);
 }
 #endif
-
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index c640e688316..d9ea5700d23 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lc_isa.c,v 1.12 2015/11/24 17:11:39 mpi Exp $ */
+/*	$OpenBSD: if_lc_isa.c,v 1.13 2021/03/07 06:17:03 jsg Exp $ */
 /*	$NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */
 
 /*-
@@ -77,10 +77,7 @@ struct cfattach lc_isa_ca = {
 };
 
 int
-lemac_isa_find(sc, ia, attach)
-	struct lemac_softc *sc;
-	struct isa_attach_args *ia;
-	int attach;
+lemac_isa_find(struct lemac_softc *sc, struct isa_attach_args *ia, int attach)
 {
 	bus_addr_t maddr;
 	bus_size_t msize;
@@ -170,10 +167,7 @@ outio:
 }
 
 int
-lemac_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+lemac_isa_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	struct cfdata *cf = ((struct device *)match)->dv_cfdata;
@@ -186,10 +180,7 @@ lemac_isa_probe(parent, match, aux)
 }
 
 void
-lemac_isa_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+lemac_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct lemac_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index fedc9bcf0f3..87270f830f2 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_isa.c,v 1.14 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_sm_isa.c,v 1.15 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -80,9 +80,7 @@ struct cfattach sm_isa_ca = {
 };
 
 int
-sm_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+sm_isa_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
@@ -145,9 +143,7 @@ sm_isa_match(parent, match, aux)
 }
 
 void
-sm_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+sm_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sm_isa_softc *isc = (struct sm_isa_softc *)self;
 	struct smc91cxx_softc *sc = &isc->sc_smc;
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 2e362e58165..a520b5639e7 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa.c,v 1.47 2019/05/09 17:38:23 semarie Exp $	*/
+/*	$OpenBSD: isa.c,v 1.48 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $	*/
 
 /*
@@ -81,9 +81,7 @@ struct cfdriver isa_cd = {
 };
 
 int
-isamatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+isamatch(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 	struct isabus_attach_args *iba = aux;
@@ -97,9 +95,7 @@ isamatch(parent, match, aux)
 }
 
 void
-isaattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+isaattach(struct device *parent, struct device *self, void *aux)
 {
 	struct isa_softc *sc = (struct isa_softc *)self;
 	struct isabus_attach_args *iba = aux;
@@ -150,9 +146,7 @@ isaattach(parent, self, aux)
 }
 
 int
-isaprint(aux, isa)
-	void *aux;
-	const char *isa;
+isaprint(void *aux, const char *isa)
 {
 	struct isa_attach_args *ia = aux;
 	int irq, nirq;
@@ -191,9 +185,7 @@ isaprint(aux, isa)
 }
 
 void
-isascan(parent, match)
-	struct device *parent;
-	void *match;
+isascan(struct device *parent, void *match)
 {
 	struct isa_softc *sc = (struct isa_softc *)parent;
 	struct device *dev = match;
@@ -296,8 +288,7 @@ isascan(parent, match)
 }
 
 char *
-isa_intr_typename(type)
-	int type;
+isa_intr_typename(int type)
 {
 
 	switch (type) {
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 7082d83695d..1c08ccb2174 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma.c,v 1.34 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: isadma.c,v 1.35 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $	*/
 
 /*-
@@ -93,9 +93,7 @@ struct cfdriver isadma_cd = {
 };
 
 int
-isadmamatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+isadmamatch(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 
@@ -105,9 +103,7 @@ isadmamatch(parent, match, aux)
 }
 
 void
-isadmaattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+isadmaattach(struct device *parent, struct device *self, void *aux)
 {
 #ifdef __ISADMA_COMPAT
 	int i, sz;
@@ -134,9 +130,7 @@ static inline void isa_dmaunmask(struct isa_softc *, int);
 static inline void isa_dmamask(struct isa_softc *, int);
 
 static inline void
-isa_dmaunmask(sc, chan)
-	struct isa_softc *sc;
-	int chan;
+isa_dmaunmask(struct isa_softc *sc, int chan)
 {
 	int ochan = chan & 3;
 
@@ -150,9 +144,7 @@ isa_dmaunmask(sc, chan)
 }
 
 static inline void
-isa_dmamask(sc, chan)
-	struct isa_softc *sc;
-	int chan;
+isa_dmamask(struct isa_softc *sc, int chan)
 {
 	int ochan = chan & 3;
 
@@ -175,9 +167,7 @@ isa_dmamask(sc, chan)
  * external dma control by a board.
  */
 void
-isa_dmacascade(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmacascade(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	int ochan = chan & 3;
@@ -210,11 +200,7 @@ isa_dmacascade(isadev, chan)
 }
 
 int
-isa_dmamap_create(isadev, chan, size, flags)
-	struct device *isadev;
-	int chan;
-	bus_size_t size;
-	int flags;
+isa_dmamap_create(struct device *isadev, int chan, bus_size_t size, int flags)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_size_t maxsize;
@@ -247,9 +233,7 @@ isa_dmamap_create(isadev, chan, size, flags)
 }
 
 void
-isa_dmamap_destroy(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmamap_destroy(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 
@@ -278,14 +262,8 @@ isa_dmamap_destroy(isadev, chan)
  * in motion.
  */
 int
-isa_dmastart(isadev, chan, addr, nbytes, p, flags, busdmaflags)
-	struct device *isadev;
-	int chan;
-	void *addr;
-	bus_size_t nbytes;
-	struct proc *p;
-	int flags;
-	int busdmaflags;
+isa_dmastart(struct device *isadev, int chan, void *addr, bus_size_t nbytes,
+    struct proc *p, int flags, int busdmaflags)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dmamap_t dmam;
@@ -416,9 +394,7 @@ isa_dmastart(isadev, chan, addr, nbytes, p, flags, busdmaflags)
 }
 
 void
-isa_dmaabort(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmaabort(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 
@@ -433,9 +409,7 @@ isa_dmaabort(isadev, chan)
 }
 
 bus_size_t
-isa_dmacount(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmacount(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	int waport;
@@ -482,9 +456,7 @@ isa_dmacount(isadev, chan)
 }
 
 int
-isa_dmafinished(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmafinished(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 
@@ -505,9 +477,7 @@ isa_dmafinished(isadev, chan)
 }
 
 void
-isa_dmadone(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_dmadone(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dmamap_t dmam;
@@ -534,12 +504,8 @@ isa_dmadone(isadev, chan)
 }
 
 int
-isa_dmamem_alloc(isadev, chan, size, addrp, flags)
-	struct device *isadev;
-	int chan;
-	bus_size_t size;
-	bus_addr_t *addrp;
-	int flags;
+isa_dmamem_alloc(struct device *isadev, int chan, bus_size_t size,
+    bus_addr_t *addrp, int flags)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dma_segment_t seg;
@@ -564,11 +530,8 @@ isa_dmamem_alloc(isadev, chan, size, addrp, flags)
 }
 
 void
-isa_dmamem_free(isadev, chan, addr, size)
-	struct device *isadev;
-	int chan;
-	bus_addr_t addr;
-	bus_size_t size;
+isa_dmamem_free(struct device *isadev, int chan, bus_addr_t addr,
+    bus_size_t size)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dma_segment_t seg;
@@ -585,13 +548,8 @@ isa_dmamem_free(isadev, chan, addr, size)
 }
 
 int
-isa_dmamem_map(isadev, chan, addr, size, kvap, flags)
-	struct device *isadev;
-	int chan;
-	bus_addr_t addr;
-	bus_size_t size;
-	caddr_t *kvap;
-	int flags;
+isa_dmamem_map(struct device *isadev, int chan, bus_addr_t addr,
+    bus_size_t size, caddr_t *kvap, int flags)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dma_segment_t seg;
@@ -608,11 +566,7 @@ isa_dmamem_map(isadev, chan, addr, size, kvap, flags)
 }
 
 void
-isa_dmamem_unmap(isadev, chan, kva, size)
-	struct device *isadev;
-	int chan;
-	caddr_t kva;
-	size_t size;
+isa_dmamem_unmap(struct device *isadev, int chan, caddr_t kva, size_t size)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 
@@ -625,12 +579,8 @@ isa_dmamem_unmap(isadev, chan, kva, size)
 }
 
 int
-isa_dmamem_mmap(isadev, chan, addr, size, off, prot, flags)
-	struct device *isadev;
-	int chan;
-	bus_addr_t addr;
-	bus_size_t size;
-	int off, prot, flags;
+isa_dmamem_mmap(struct device *isadev, int chan, bus_addr_t addr,
+    bus_size_t size, int off, int prot, int flags)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	bus_dma_segment_t seg;
@@ -650,9 +600,7 @@ isa_dmamem_mmap(isadev, chan, addr, size, off, prot, flags)
 }
 
 int
-isa_drq_isfree(isadev, chan)
-	struct device *isadev;
-	int chan;
+isa_drq_isfree(struct device *isadev, int chan)
 {
 	struct isa_softc *sc = (struct isa_softc *)isadev;
 	if (chan < 0 || chan > 7) {
@@ -663,12 +611,7 @@ isa_drq_isfree(isadev, chan)
 }
 
 void *
-isa_malloc(isadev, chan, size, pool, flags)
-	struct device *isadev;
-	int chan;
-	size_t size;
-	int pool;
-	int flags;
+isa_malloc(struct device *isadev, int chan, size_t size, int pool, int flags)
 {
 	bus_addr_t addr;
 	caddr_t kva;
@@ -700,9 +643,7 @@ isa_malloc(isadev, chan, size, pool, flags)
 }
 
 void
-isa_free(addr, pool)
-	void *addr;
-	int pool;
+isa_free(void *addr, int pool)
 {
 	struct isa_mem **mp, *m;
 	caddr_t kva = (caddr_t)addr;
@@ -721,10 +662,7 @@ isa_free(addr, pool)
 }
 
 paddr_t
-isa_mappage(mem, off, prot)
-	void *mem;
-	off_t off;
-	int prot;
+isa_mappage(void *mem, off_t off, int prot)
 {
 	struct isa_mem *m;
 
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index 2b5911aec54..6d6021d20c4 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp.c,v 1.41 2014/07/12 18:48:18 tedu Exp $	*/
+/*	$OpenBSD: isapnp.c,v 1.42 2021/03/07 06:17:03 jsg Exp $	*/
 /*	$NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $	*/
 
 /*
@@ -92,8 +92,7 @@ struct cfdriver isapnp_cd = {
  *	Write the PNP initiation key to wake up the cards...
  */
 void
-isapnp_init(sc)
-	struct isapnp_softc *sc;
+isapnp_init(struct isapnp_softc *sc)
 {
 	int i;
 	u_char v = ISAPNP_LFSR_INIT;
@@ -114,8 +113,7 @@ isapnp_init(sc)
  *	Read a bit at a time from the config card.
  */
 static __inline u_char
-isapnp_shift_bit(sc)
-	struct isapnp_softc *sc;
+isapnp_shift_bit(struct isapnp_softc *sc)
 {
 	u_char c1, c2;
 
@@ -137,8 +135,7 @@ isapnp_shift_bit(sc)
  *	next card number to it and return 1
  */
 int
-isapnp_findcard(sc)
-	struct isapnp_softc *sc;
+isapnp_findcard(struct isapnp_softc *sc)
 {
 	u_char v = ISAPNP_LFSR_INIT, csum, w;
 	int i, b;
@@ -192,9 +189,7 @@ isapnp_findcard(sc)
  *	Free a region
  */
 void
-isapnp_free_region(t, r)
-	bus_space_tag_t t;
-	struct isapnp_region *r;
+isapnp_free_region(bus_space_tag_t t, struct isapnp_region *r)
 {
 	if (r->length == 0)
 		return;
@@ -208,9 +203,7 @@ isapnp_free_region(t, r)
  *	Allocate a single region if possible
  */
 int
-isapnp_alloc_region(t, r)
-	bus_space_tag_t t;
-	struct isapnp_region *r;
+isapnp_alloc_region(bus_space_tag_t t, struct isapnp_region *r)
 {
 	int error = 0;
 
@@ -232,9 +225,7 @@ isapnp_alloc_region(t, r)
  *	Allocate an irq
  */
 int
-isapnp_alloc_irq(ic, i)
-	isa_chipset_tag_t ic;
-	struct isapnp_pin *i;
+isapnp_alloc_irq(isa_chipset_tag_t ic, struct isapnp_pin *i)
 {
 	int irq;
 #define LEVEL_IRQ (ISAPNP_IRQTYPE_LEVEL_PLUS|ISAPNP_IRQTYPE_LEVEL_MINUS)
@@ -257,9 +248,7 @@ isapnp_alloc_irq(ic, i)
  *	Allocate a drq
  */
 int
-isapnp_alloc_drq(isa, i)
-	struct device *isa;
-	struct isapnp_pin *i;
+isapnp_alloc_drq(struct device *isa, struct isapnp_pin *i)
 {
 #if NISADMA > 0
 	int b;
@@ -283,10 +272,8 @@ isapnp_alloc_drq(isa, i)
  *	Test/Allocate the regions used
  */
 int
-isapnp_testconfig(iot, memt, ipa, alloc)
-	bus_space_tag_t iot, memt;
-	struct isa_attach_args *ipa;
-	int alloc;
+isapnp_testconfig(bus_space_tag_t iot, bus_space_tag_t memt,
+    struct isa_attach_args *ipa, int alloc)
 {
 	int nio = 0, nmem = 0, nmem32 = 0, nirq = 0, ndrq = 0;
 	int error = 0;
@@ -346,9 +333,8 @@ bad:
  *	Test/Allocate the regions used
  */
 int
-isapnp_config(iot, memt, ipa)
-	bus_space_tag_t iot, memt;
-	struct isa_attach_args *ipa;
+isapnp_config(bus_space_tag_t iot, bus_space_tag_t memt,
+    struct isa_attach_args *ipa)
 {
 	return isapnp_testconfig(iot, memt, ipa, 1);
 }
@@ -358,9 +344,8 @@ isapnp_config(iot, memt, ipa)
  *	Free the regions used
  */
 void
-isapnp_unconfig(iot, memt, ipa)
-	bus_space_tag_t iot, memt;
-	struct isa_attach_args *ipa;
+isapnp_unconfig(bus_space_tag_t iot, bus_space_tag_t memt,
+    struct isa_attach_args *ipa)
 {
 	int i;
 
@@ -380,10 +365,8 @@ isapnp_unconfig(iot, memt, ipa)
  *	free all other configurations.
  */
 struct isa_attach_args *
-isapnp_bestconfig(isa, sc, ipa)
-	struct device *isa;
-	struct isapnp_softc *sc;
-	struct isa_attach_args **ipa;
+isapnp_bestconfig(struct device *isa, struct isapnp_softc *sc,
+    struct isa_attach_args **ipa)
 {
 	struct isa_attach_args *c, *best, *f = *ipa;
 	int error;
@@ -463,9 +446,7 @@ isapnp_bestconfig(isa, sc, ipa)
  *	Convert a pnp ``compressed ascii'' vendor id to a string
  */
 char *
-isapnp_id_to_vendor(v, id)
-	char   *v;
-	const u_char *id;
+isapnp_id_to_vendor(char *v, const u_char *id)
 {
 	static const char hex[] = "0123456789ABCDEF";
 	char *p = v;
@@ -487,10 +468,7 @@ isapnp_id_to_vendor(v, id)
  *	Print a region allocation
  */
 void
-isapnp_print_region(str, r, n)
-	const char *str;
-	struct isapnp_region *r;
-	size_t n;
+isapnp_print_region(const char *str, struct isapnp_region *r, size_t n)
 {
 	size_t i;
 
@@ -512,10 +490,7 @@ isapnp_print_region(str, r, n)
  *	Print an irq/drq assignment
  */
 void
-isapnp_print_pin(str, p, n)
-	const char *str;
-	struct isapnp_pin *p;
-	size_t n;
+isapnp_print_pin(const char *str, struct isapnp_pin *p, size_t n)
 {
 	size_t i;
 
@@ -534,9 +509,7 @@ isapnp_print_pin(str, p, n)
  *	Print the configuration line for an ISA PnP card.
  */
 int
-isapnp_print(aux, str)
-	void *aux;
-	const char *str;
+isapnp_print(void *aux, const char *str)
 {
 	struct isa_attach_args *ipa = aux;
 
@@ -563,9 +536,7 @@ isapnp_print(aux, str)
  * they should have.  If it looks like a modem..... let's try it.
  */
 int
-isapnp_com_submatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+isapnp_com_submatch(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 	struct isa_attach_args *ipa = aux;
@@ -588,9 +559,7 @@ isapnp_com_submatch(parent, match, aux)
  *	Probe the logical device...
  */
 int
-isapnp_submatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+isapnp_submatch(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 	struct isa_attach_args *ipa = aux;
@@ -627,9 +596,7 @@ isapnp_submatch(parent, match, aux)
  *	Probe and add cards
  */
 int
-isapnp_find(sc, all)
-	struct isapnp_softc *sc;
-	int all;
+isapnp_find(struct isapnp_softc *sc, int all)
 {
 	int p;
 
@@ -670,9 +637,7 @@ isapnp_find(sc, all)
  *	     range/length bit an do appropriate sets.
  */
 void
-isapnp_configure(sc, ipa)
-	struct isapnp_softc *sc;
-	const struct isa_attach_args *ipa;
+isapnp_configure(struct isapnp_softc *sc, const struct isa_attach_args *ipa)
 {
 	int i;
 	static u_char isapnp_mem_range[] = ISAPNP_MEM_DESC;
@@ -809,9 +774,7 @@ isapnp_configure(sc, ipa)
  */
 
 void
-isapnp_isa_attach_hook(isa_sc)
-	struct isa_softc *isa_sc;
-
+isapnp_isa_attach_hook(struct isa_softc *isa_sc)
 {
 	struct isapnp_softc sc;
 
@@ -834,10 +797,7 @@ isapnp_isa_attach_hook(isa_sc)
  *	Probe routine
  */
 int
-isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+isapnp_match(struct device *parent, void *match, void *aux)
 {
 	int rv;
 	struct isapnp_softc sc;
@@ -867,9 +827,7 @@ isapnp_match(parent, match, aux)
  *	Find and attach PnP cards.
  */
 void
-isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct isapnp_softc *sc = (struct isapnp_softc *) self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 684957a95b5..c588a867c1d 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_isa.c,v 1.15 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: lpt_isa.c,v 1.16 2021/03/07 06:17:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -93,9 +93,7 @@ struct cfattach lpt_isa_ca = {
  *	3) Set the data and control ports to a value of 0
  */
 int
-lpt_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+lpt_isa_probe(struct device *parent, void *match, void *aux)
 {
 #if !defined(__NO_ISA_INTR_CHECK)
 	struct isa_softc *sc = (struct isa_softc *)parent;
@@ -170,9 +168,7 @@ out:
 }
 
 void
-lpt_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+lpt_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct lpt_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c
index e45a5cef9ca..cacab0e6442 100644
--- a/sys/dev/isa/mpu401.c
+++ b/sys/dev/isa/mpu401.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu401.c,v 1.15 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: mpu401.c,v 1.16 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $	*/
 
 /*
@@ -78,8 +78,7 @@ struct midi_hw_if mpu_midi_hw_if = {
 };
 
 int
-mpu_find(v)
-	void *v;
+mpu_find(void *v)
 {
 	struct mpu_softc *sc = v;
 
@@ -96,8 +95,7 @@ bad:
 }
 
 static __inline int
-mpu_waitready(sc)
-	struct mpu_softc *sc;
+mpu_waitready(struct mpu_softc *sc)
 {
 	int i;
 
@@ -110,8 +108,7 @@ mpu_waitready(sc)
 }
 
 int
-mpu_reset(sc)
-	struct mpu_softc *sc;
+mpu_reset(struct mpu_softc *sc)
 {
 	bus_space_tag_t iot = sc->iot;
 	bus_space_handle_t ioh = sc->ioh;
@@ -136,12 +133,8 @@ mpu_reset(sc)
 }
 
 int
-mpu_open(v, flags, iintr, ointr, arg)
-	void *v;
-	int flags;
-	void (*iintr)(void *, int);
-	void (*ointr)(void *);
-	void *arg;
+mpu_open(void *v, int flags, void (*iintr)(void *, int), void (*ointr)(void *),
+    void *arg)
 {
 	struct mpu_softc *sc = v;
 
@@ -160,8 +153,7 @@ mpu_open(v, flags, iintr, ointr, arg)
 }
 
 void
-mpu_close(v)
-	void *v;
+mpu_close(void *v)
 {
 	struct mpu_softc *sc = v;
 
@@ -173,8 +165,7 @@ mpu_close(v)
 }
 
 void
-mpu_readinput(sc)
-	struct mpu_softc *sc;
+mpu_readinput(struct mpu_softc *sc)
 {
 	bus_space_tag_t iot = sc->iot;
 	bus_space_handle_t ioh = sc->ioh;
@@ -192,9 +183,7 @@ mpu_readinput(sc)
  * called with audio_lock
  */
 int
-mpu_output(v, d)
-	void *v;
-	int d;
+mpu_output(void *v, int d)
 {
 	struct mpu_softc *sc = v;
 
@@ -211,17 +200,14 @@ mpu_output(v, d)
 }
 
 void
-mpu_getinfo(addr, mi)
-	void *addr;
-	struct midi_info *mi;
+mpu_getinfo(void *addr, struct midi_info *mi)
 {
 	mi->name = "MPU-401 MIDI UART";
 	mi->props = 0;
 }
 
 int
-mpu_intr(v)
-	void *v;
+mpu_intr(void *v)
 {
 	struct mpu_softc *sc = v;
 
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index 3a49d3f9631..eddb494e287 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu_isa.c,v 1.6 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: mpu_isa.c,v 1.7 2021/03/07 06:17:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Sergey Smitienko. All rights reserved.
@@ -68,9 +68,7 @@ struct cfattach mpu_isa_ca = {
 };
 
 int
-mpu_test (iot, iobase)
-	bus_space_tag_t iot;
-	int iobase;	/* base port number to try */
+mpu_test(bus_space_tag_t iot, int iobase)	/* base port number to try */
 {
 	bus_space_handle_t ioh;
 	int	i, rc;
@@ -116,9 +114,7 @@ done:
 }
 
 int
-mpu_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+mpu_isa_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 
@@ -131,9 +127,7 @@ mpu_isa_match(parent, match, aux)
 }
 
 void
-mpu_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+mpu_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct mpu_isa_softc *sc = (struct mpu_isa_softc *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c
index febf0a769ad..6eac6005cd5 100644
--- a/sys/dev/isa/mpu_isapnp.c
+++ b/sys/dev/isa/mpu_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu_isapnp.c,v 1.8 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: mpu_isapnp.c,v 1.9 2021/03/07 06:17:04 jsg Exp $	*/
 
 #include "midi.h"
 
@@ -36,9 +36,7 @@ struct cfattach mpu_isapnp_ca = {
 };
 
 int
-mpu_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+mpu_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ipa = aux;
 
@@ -48,9 +46,7 @@ mpu_isapnp_match(parent, match, aux)
 }
 
 void
-mpu_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+mpu_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct mpu_isapnp_softc *sc = (struct mpu_isapnp_softc *)self;
 	struct isa_attach_args *ipa = aux;
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 450f3405bfe..fd3363d0ec8 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pas.c,v 1.29 2016/09/19 06:46:44 ratchov Exp $	*/
+/*	$OpenBSD: pas.c,v 1.30 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $	*/
 
 /*
@@ -149,11 +149,7 @@ static char *pasnames[] = {
 #define paswrite(d, p) outb(p, d)
 
 void
-pasconf(model, sbbase, sbirq, sbdrq)
-	int model;
-	int sbbase;
-	int sbirq;
-	int sbdrq;
+pasconf(int model, int sbbase, int sbirq, int sbdrq)
 {
 	paswrite(0x00, INTERRUPT_MASK);
 	/* Local timer control register */
@@ -247,9 +243,7 @@ struct cfdriver pas_cd = {
  * Probe for the soundblaster hardware.
  */
 int
-pasprobe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+pasprobe(struct device *parent, void *match, void *aux)
 {
 	struct pas_softc *sc = match;
 	struct isa_attach_args *ia = aux;
@@ -388,9 +382,7 @@ pasprobe(parent, match, aux)
  * pseudo-device driver .
  */
 void
-pasattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pasattach(struct device *parent, struct device *self, void *aux)
 {
 	struct pas_softc *sc = (struct pas_softc *)self;
 	struct isa_attach_args *ia = (struct isa_attach_args *)aux;
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index d57a9933d97..9b91d1fe29d 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcppi.c,v 1.16 2020/04/06 17:54:50 cheloha Exp $ */
+/* $OpenBSD: pcppi.c,v 1.17 2021/03/07 06:17:04 jsg Exp $ */
 /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
 
 /*
@@ -82,10 +82,7 @@ static void pcppi_bell_stop(void *);
 #define PCPPIPRI (PZERO - 1)
 
 int
-pcppi_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+pcppi_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_handle_t ppi_ioh, pit1_ioh;
@@ -149,9 +146,7 @@ lose:
 }
 
 void
-pcppi_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pcppi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct pcppi_softc *sc = (struct pcppi_softc *)self;
 	struct isa_attach_args *ia = aux;
@@ -184,10 +179,7 @@ pcppi_attach(parent, self, aux)
 }
 
 void
-pcppi_bell(self, pitch, period_ms, slp)
-	pcppi_tag_t self;
-	int pitch, period_ms;
-	int slp;
+pcppi_bell(pcppi_tag_t self, int pitch, int period_ms, int slp)
 {
 	struct pcppi_softc *sc = self;
 	int s1, s2;
@@ -252,8 +244,7 @@ pcppi_bell(self, pitch, period_ms, slp)
 }
 
 static void
-pcppi_bell_stop(arg)
-	void *arg;
+pcppi_bell_stop(void *arg)
 {
 	struct pcppi_softc *sc = arg;
 	int s;
@@ -273,10 +264,7 @@ pcppi_bell_stop(arg)
 
 #if NPCKBD > 0 || NHIDKBD > 0
 void
-pcppi_kbd_bell(arg, pitch, period, volume, poll)
-	void *arg;
-	u_int pitch, period, volume;
-	int poll;
+pcppi_kbd_bell(void *arg, u_int pitch, u_int period, u_int volume, int poll)
 {
 	/*
 	 * NB: volume ignored.
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 4bc83442e54..9458d043c4e 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb.c,v 1.29 2016/09/19 06:46:44 ratchov Exp $	*/
+/*	$OpenBSD: sb.c,v 1.30 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $	*/
 
 /*
@@ -131,8 +131,7 @@ int	sbdebug = 0;
 
 
 int
-sbmatch(sc)
-	struct sbdsp_softc *sc;
+sbmatch(struct sbdsp_softc *sc)
 {
 	static u_char drq_conf[8] = {
 		0x01, 0x02, -1, 0x08, -1, 0x20, 0x40, 0x80
@@ -240,8 +239,7 @@ sbmatch(sc)
 
 
 void
-sbattach(sc)
-	struct sbdsp_softc *sc;
+sbattach(struct sbdsp_softc *sc)
 {
 	struct audio_attach_args arg;
 #if NMIDI > 0
@@ -283,35 +281,26 @@ sbattach(sc)
 #define SBMPU(a) (&((struct sbdsp_softc *)addr)->sc_mpu_sc)
 
 int
-sb_mpu401_open(addr, flags, iintr, ointr, arg)
-	void *addr;
-	int flags;
-	void (*iintr)(void *, int);
-	void (*ointr)(void *);
-	void *arg;
+sb_mpu401_open(void *addr, int flags, void (*iintr)(void *, int),
+    void (*ointr)(void *), void *arg)
 {
 	return mpu_open(SBMPU(addr), flags, iintr, ointr, arg);
 }
 
 int
-sb_mpu401_output(addr, d)
-	void *addr;
-	int d;
+sb_mpu401_output(void *addr, int d)
 {
 	return mpu_output(SBMPU(addr), d);
 }
 
 void
-sb_mpu401_close(addr)
-	void *addr;
+sb_mpu401_close(void *addr)
 {
 	mpu_close(SBMPU(addr));
 }
 
 void
-sb_mpu401_getinfo(addr, mi)
-	void *addr;
-	struct midi_info *mi;
+sb_mpu401_getinfo(void *addr, struct midi_info *mi)
 {
 	mi->name = "SB MPU-401 UART";
 	mi->props = 0;
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 6615322ca18..1ba2030eeb5 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.10 2015/05/12 16:35:23 ratchov Exp $	*/
+/*	$OpenBSD: sb_isa.c,v 1.11 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $	*/
 
 /*
@@ -73,10 +73,7 @@ struct cfattach sb_isa_ca = {
  * Probe for the soundblaster hardware.
  */
 int
-sb_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+sb_isa_match(struct device *parent, void *match, void *aux)
 {
 	struct sbdsp_softc probesc, *sc = &probesc;
 
@@ -87,10 +84,8 @@ sb_isa_match(parent, match, aux)
 }
 
 static int
-sbfind(parent, sc, ia)
-	struct device *parent;
-	struct sbdsp_softc *sc;
-	struct isa_attach_args *ia;
+sbfind(struct device *parent, struct sbdsp_softc *sc,
+    struct isa_attach_args *ia)
 {
 	int rc = 0;
 
@@ -140,9 +135,7 @@ bad:
  * pseudo-device driver .
  */
 void
-sb_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+sb_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sbdsp_softc *sc = (struct sbdsp_softc *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
index ec07cb5143e..5ae25609c22 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.15 2015/05/12 16:35:23 ratchov Exp $	*/
+/*	$OpenBSD: sb_isapnp.c,v 1.16 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $	*/
 
 /*
@@ -69,9 +69,7 @@ struct cfattach sb_isapnp_ca = {
  * Probe for the soundblaster hardware.
  */
 int
-sb_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+sb_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 
@@ -85,9 +83,7 @@ sb_isapnp_match(parent, match, aux)
  * pseudo-device driver.
  */
 void
-sb_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+sb_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sbdsp_softc *sc = (struct sbdsp_softc *) self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index d40ca5bf188..8383b0f2527 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbdsp.c,v 1.38 2019/12/31 10:05:32 mpi Exp $	*/
+/*	$OpenBSD: sbdsp.c,v 1.39 2021/03/07 06:17:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -194,8 +194,7 @@ int	sbdsp_midi_intr(void *);
 void	sb_printsc(struct sbdsp_softc *);
 
 void
-sb_printsc(sc)
-	struct sbdsp_softc *sc;
+sb_printsc(struct sbdsp_softc *sc)
 {
 	int i;
 
@@ -227,8 +226,7 @@ sb_printsc(sc)
  * Probe for the soundblaster hardware.
  */
 int
-sbdsp_probe(sc)
-	struct sbdsp_softc *sc;
+sbdsp_probe(struct sbdsp_softc *sc)
 {
 
 	if (sbdsp_reset(sc) < 0) {
@@ -252,8 +250,7 @@ sbdsp_probe(sc)
  * Try add-on stuff for Jazz16.
  */
 void
-sbdsp_jazz16_probe(sc)
-	struct sbdsp_softc *sc;
+sbdsp_jazz16_probe(struct sbdsp_softc *sc)
 {
 	static u_char jazz16_irq_conf[16] = {
 	    -1, -1, 0x02, 0x03,
@@ -324,8 +321,7 @@ done:
  * pseudo-device driver .
  */
 void
-sbdsp_attach(sc)
-	struct sbdsp_softc *sc;
+sbdsp_attach(struct sbdsp_softc *sc)
 {
 	struct audio_params pparams, rparams;
         int i;
@@ -405,10 +401,7 @@ sbdsp_attach(sc)
 }
 
 void
-sbdsp_mix_write(sc, mixerport, val)
-	struct sbdsp_softc *sc;
-	int mixerport;
-	int val;
+sbdsp_mix_write(struct sbdsp_softc *sc, int mixerport, int val)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -422,9 +415,7 @@ sbdsp_mix_write(sc, mixerport, val)
 }
 
 int
-sbdsp_mix_read(sc, mixerport)
-	struct sbdsp_softc *sc;
-	int mixerport;
+sbdsp_mix_read(struct sbdsp_softc *sc, int mixerport)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -444,10 +435,8 @@ sbdsp_mix_read(sc, mixerport)
  */
 
 int
-sbdsp_set_params(addr, setmode, usemode, play, rec)
-	void *addr;
-	int setmode, usemode;
-	struct audio_params *play, *rec;
+sbdsp_set_params(void *addr, int setmode, int usemode,
+    struct audio_params *play, struct audio_params *rec)
 {
 	struct sbdsp_softc *sc = addr;
 	struct sbmode *m;
@@ -639,9 +628,7 @@ sbdsp_set_params(addr, setmode, usemode, play, rec)
 }
 
 void
-sbdsp_set_ifilter(addr, which)
-	void *addr;
-	int which;
+sbdsp_set_ifilter(void *addr, int which)
 {
 	struct sbdsp_softc *sc = addr;
 	int mixval;
@@ -665,8 +652,7 @@ sbdsp_set_ifilter(addr, which)
 }
 
 int
-sbdsp_get_ifilter(addr)
-	void *addr;
+sbdsp_get_ifilter(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -683,9 +669,7 @@ sbdsp_get_ifilter(addr)
 }
 
 int
-sbdsp_set_in_ports(sc, mask)
-	struct sbdsp_softc *sc;
-	int mask;
+sbdsp_set_in_ports(struct sbdsp_softc *sc, int mask)
 {
 	int bitsl, bitsr;
 	int sbport;
@@ -743,9 +727,7 @@ sbdsp_set_in_ports(sc, mask)
 }
 
 int
-sbdsp_speaker_ctl(addr, newstate)
-	void *addr;
-	int newstate;
+sbdsp_speaker_ctl(void *addr, int newstate)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -766,17 +748,13 @@ sbdsp_speaker_ctl(addr, newstate)
 }
 
 int
-sbdsp_round_blocksize(addr, blk)
-	void *addr;
-	int blk;
+sbdsp_round_blocksize(void *addr, int blk)
 {
 	return (blk + 3) & -4;	/* round to biggest sample size */
 }
 
 int
-sbdsp_open(addr, flags)
-	void *addr;
-	int flags;
+sbdsp_open(void *addr, int flags)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -808,8 +786,7 @@ sbdsp_open(addr, flags)
 }
 
 void
-sbdsp_close(addr)
-	void *addr;
+sbdsp_close(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -835,8 +812,7 @@ sbdsp_close(addr)
  * Return non-zero if the card isn't detected.
  */
 int
-sbdsp_reset(sc)
-	struct sbdsp_softc *sc;
+sbdsp_reset(struct sbdsp_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -873,9 +849,7 @@ sbdsp_reset(sc)
  * polling loop and wait until it can take the byte.
  */
 int
-sbdsp_wdsp(sc, v)
-	struct sbdsp_softc *sc;
-	int v;
+sbdsp_wdsp(struct sbdsp_softc *sc, int v)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -899,8 +873,7 @@ sbdsp_wdsp(sc, v)
  * Read a byte from the DSP, using polling.
  */
 int
-sbdsp_rdsp(sc)
-	struct sbdsp_softc *sc;
+sbdsp_rdsp(struct sbdsp_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -925,15 +898,13 @@ sbdsp_rdsp(sc)
  * the SB hardware go away for a while, so pause a little.
  */
 void
-sbdsp_to(arg)
-	void *arg;
+sbdsp_to(void *arg)
 {
 	wakeup(arg);
 }
 
 void
-sbdsp_pause(sc)
-	struct sbdsp_softc *sc;
+sbdsp_pause(struct sbdsp_softc *sc)
 {
 	timeout_add_msec(&sc->sc_tmo, 125);	/* 8x per second */
 	tsleep_nsec(sbdsp_to, PWAIT, "sbpause", INFSLP);
@@ -950,8 +921,7 @@ sbdsp_pause(sc)
  * they designed this card.
  */
 void
-sbdsp_spkron(sc)
-	struct sbdsp_softc *sc;
+sbdsp_spkron(struct sbdsp_softc *sc)
 {
 	(void)sbdsp_wdsp(sc, SB_DSP_SPKR_ON);
 	sbdsp_pause(sc);
@@ -961,8 +931,7 @@ sbdsp_spkron(sc)
  * Turn off the speaker; see comment above.
  */
 void
-sbdsp_spkroff(sc)
-	struct sbdsp_softc *sc;
+sbdsp_spkroff(struct sbdsp_softc *sc)
 {
 	(void)sbdsp_wdsp(sc, SB_DSP_SPKR_OFF);
 	sbdsp_pause(sc);
@@ -973,8 +942,7 @@ sbdsp_spkroff(sc)
  * Store version information in the softc.
  */
 void
-sbversion(sc)
-	struct sbdsp_softc *sc;
+sbversion(struct sbdsp_softc *sc)
 {
 	int v;
 
@@ -1040,8 +1008,7 @@ sbversion(sc)
  * Halt a DMA in progress.
  */
 int
-sbdsp_haltdma(addr)
-	void *addr;
+sbdsp_haltdma(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -1054,9 +1021,7 @@ sbdsp_haltdma(addr)
 }
 
 int
-sbdsp_set_timeconst(sc, tc)
-	struct sbdsp_softc *sc;
-	int tc;
+sbdsp_set_timeconst(struct sbdsp_softc *sc, int tc)
 {
 	DPRINTF(("sbdsp_set_timeconst: sc=%p tc=%d\n", sc, tc));
 
@@ -1068,9 +1033,7 @@ sbdsp_set_timeconst(sc, tc)
 }
 
 int
-sbdsp16_set_rate(sc, cmd, rate)
-	struct sbdsp_softc *sc;
-	int cmd, rate;
+sbdsp16_set_rate(struct sbdsp_softc *sc, int cmd, int rate)
 {
 	DPRINTF(("sbdsp16_set_rate: sc=%p cmd=0x%02x rate=%d\n", sc, cmd, rate));
 
@@ -1082,13 +1045,8 @@ sbdsp16_set_rate(sc, cmd, rate)
 }
 
 int
-sbdsp_trigger_input(addr, start, end, blksize, intr, arg, param)
-	void *addr;
-	void *start, *end;
-	int blksize;
-	void (*intr)(void *);
-	void *arg;
-	struct audio_params *param;
+sbdsp_trigger_input(void *addr, void *start, void *end, int blksize,
+    void (*intr)(void *), void *arg, struct audio_params *param)
 {
 	struct sbdsp_softc *sc = addr;
 	int stereo = param->channels == 2;
@@ -1167,8 +1125,7 @@ sbdsp_trigger_input(addr, start, end, blksize, intr, arg, param)
 }
 
 int
-sbdsp_block_input(addr)
-	void *addr;
+sbdsp_block_input(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 	int cc = sc->sc_i.blksize;
@@ -1219,13 +1176,8 @@ sbdsp_block_input(addr)
 }
 
 int
-sbdsp_trigger_output(addr, start, end, blksize, intr, arg, param)
-	void *addr;
-	void *start, *end;
-	int blksize;
-	void (*intr)(void *);
-	void *arg;
-	struct audio_params *param;
+sbdsp_trigger_output(void *addr, void *start, void *end, int blksize,
+    void (*intr)(void *), void *arg, struct audio_params *param)
 {
 	struct sbdsp_softc *sc = addr;
 	int stereo = param->channels == 2;
@@ -1305,8 +1257,7 @@ sbdsp_trigger_output(addr, start, end, blksize, intr, arg, param)
 }
 
 int
-sbdsp_block_output(addr)
-	void *addr;
+sbdsp_block_output(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 	int cc = sc->sc_o.blksize;
@@ -1367,8 +1318,7 @@ sbdsp_block_output(addr)
  * an SB2 and experience problems, buy an SB16 (it's only $40).
  */
 int
-sbdsp_intr(arg)
-	void *arg;
+sbdsp_intr(void *arg)
 {
 	struct sbdsp_softc *sc = arg;
 	u_char irq;
@@ -1419,8 +1369,7 @@ sbdsp_intr(arg)
 /* Like val & mask, but make sure the result is correctly rounded. */
 #define MAXVAL 256
 static int
-sbdsp_adjust(val, mask)
-	int val, mask;
+sbdsp_adjust(int val, int mask)
 {
 	val += (MAXVAL - mask) >> 1;
 	if (val >= MAXVAL)
@@ -1429,9 +1378,7 @@ sbdsp_adjust(val, mask)
 }
 
 void
-sbdsp_set_mixer_gain(sc, port)
-	struct sbdsp_softc *sc;
-	int port;
+sbdsp_set_mixer_gain(struct sbdsp_softc *sc, int port)
 {
 	int src, gain;
 
@@ -1533,9 +1480,7 @@ sbdsp_set_mixer_gain(sc, port)
 }
 
 int
-sbdsp_mixer_set_port(addr, cp)
-	void *addr;
-	mixer_ctrl_t *cp;
+sbdsp_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct sbdsp_softc *sc = addr;
 	int lgain, rgain;
@@ -1724,9 +1669,7 @@ sbdsp_mixer_set_port(addr, cp)
 }
 
 int
-sbdsp_mixer_get_port(addr, cp)
-	void *addr;
-	mixer_ctrl_t *cp;
+sbdsp_mixer_get_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -1825,9 +1768,7 @@ sbdsp_mixer_get_port(addr, cp)
 }
 
 int
-sbdsp_mixer_query_devinfo(addr, dip)
-	void *addr;
-	mixer_devinfo_t *dip;
+sbdsp_mixer_query_devinfo(void *addr, mixer_devinfo_t *dip)
 {
 	struct sbdsp_softc *sc = addr;
 	int chan, class, is1745;
@@ -2143,12 +2084,7 @@ sbdsp_mixer_query_devinfo(addr, dip)
 }
 
 void *
-sb_malloc(addr, direction, size, pool, flags)
-	void *addr;
-	int direction;
-	size_t size;
-	int pool;
-	int flags;
+sb_malloc(void *addr, int direction, size_t size, int pool, int flags)
 {
 	struct sbdsp_softc *sc = addr;
 	int drq;
@@ -2163,19 +2099,13 @@ sb_malloc(addr, direction, size, pool, flags)
 }
 
 void
-sb_free(addr, ptr, pool)
-	void *addr;
-	void *ptr;
-	int pool;
+sb_free(void *addr, void *ptr, int pool)
 {
 	isa_free(ptr, pool);
 }
 
 size_t
-sb_round(addr, direction, size)
-	void *addr;
-	int direction;
-	size_t size;
+sb_round(void *addr, int direction, size_t size)
 {
 	if (size > MAX_ISADMA)
 		size = MAX_ISADMA;
@@ -2183,8 +2113,7 @@ sb_round(addr, direction, size)
 }
 
 int
-sbdsp_get_props(addr)
-	void *addr;
+sbdsp_get_props(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 	return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
@@ -2197,12 +2126,8 @@ sbdsp_get_props(addr)
  */
 
 int
-sbdsp_midi_open(addr, flags, iintr, ointr, arg)
-	void *addr;
-	int flags;
-	void (*iintr)(void *, int);
-	void (*ointr)(void *);
-	void *arg;
+sbdsp_midi_open(void *addr, int flags, void (*iintr)(void *, int),
+    void (*ointr)(void *), void *arg)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -2226,8 +2151,7 @@ sbdsp_midi_open(addr, flags, iintr, ointr, arg)
 }
 
 void
-sbdsp_midi_close(addr)
-	void *addr;
+sbdsp_midi_close(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -2240,9 +2164,7 @@ sbdsp_midi_close(addr)
 }
 
 int
-sbdsp_midi_output(addr, d)
-	void *addr;
-	int d;
+sbdsp_midi_output(void *addr, int d)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -2253,9 +2175,7 @@ sbdsp_midi_output(addr, d)
 }
 
 void
-sbdsp_midi_getinfo(addr, mi)
-	void *addr;
-	struct midi_info *mi;
+sbdsp_midi_getinfo(void *addr, struct midi_info *mi)
 {
 	struct sbdsp_softc *sc = addr;
 
@@ -2264,8 +2184,7 @@ sbdsp_midi_getinfo(addr, mi)
 }
 
 int
-sbdsp_midi_intr(addr)
-	void *addr;
+sbdsp_midi_intr(void *addr)
 {
 	struct sbdsp_softc *sc = addr;
 
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index ce61df8fe83..04240de05fa 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spkr.c,v 1.25 2020/04/06 17:54:50 cheloha Exp $	*/
+/*	$OpenBSD: spkr.c,v 1.26 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $	*/
 
 /*
@@ -83,16 +83,14 @@ static void playstring(char *, size_t);
 
 /* emit tone of frequency freq for given number of milliseconds */
 static void
-tone(freq, ms)
-	u_int freq, ms;
+tone(u_int freq, u_int ms)
 {
 	pcppi_bell(ppicookie, freq, ms, PCPPI_BELL_SLEEP);
 }
 
 /* rest for given number of milliseconds */
 static void
-rest(ms)
-	int ms;
+rest(int ms)
 {
 	/*
 	 * Set timeout to endrest function, then give up the timeslice.
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index f87b8fb6e8d..535c2e439a5 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2_isa.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: tcic2_isa.c,v 1.9 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $	*/
 
 #undef	TCICISADEBUG
@@ -137,10 +137,7 @@ static struct pcmcia_chip_functions tcic_isa_functions = {
 };
 
 int
-tcic_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+tcic_isa_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
@@ -190,9 +187,7 @@ tcic_isa_probe(parent, match, aux)
 }
 
 void
-tcic_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+tcic_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct tcic_softc *sc = (void *) self;
 	struct isa_attach_args *ia = aux;
@@ -307,13 +302,9 @@ tcic_isa_attach(parent, self, aux)
 }
 
 void *
-tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
-	pcmcia_chipset_handle_t pch;
-	struct pcmcia_function *pf;
-	int ipl;
-	int (*fct)(void *);
-	void *arg;
-	char *xname;
+tcic_isa_chip_intr_establish(pcmcia_chipset_handle_t pch,
+    struct pcmcia_function *pf, int ipl, int (*fct)(void *), void *arg,
+    char *xname)
 {
 	struct tcic_handle *h = (struct tcic_handle *) pch;
 	int irq, ist, val, reg;
@@ -355,9 +346,7 @@ tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 }
 
 void 
-tcic_isa_chip_intr_disestablish(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+tcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t pch, void *ih)
 {
 	struct tcic_handle *h = (struct tcic_handle *) pch;
 	int val, reg;
@@ -375,9 +364,7 @@ tcic_isa_chip_intr_disestablish(pch, ih)
 }
 
 const char *
-tcic_isa_chip_intr_string(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+tcic_isa_chip_intr_string(pcmcia_chipset_handle_t pch, void *ih)
 {
 	struct tcic_handle *h = (struct tcic_handle *) pch;
 	static char irqstr[64];
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 69bdf9b2990..5979faf12a2 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha_isa.c,v 1.13 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: uha_isa.c,v 1.14 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $	*/
 
 /*
@@ -71,9 +71,7 @@ void u14_init(struct uha_softc *);
  * the actual probe routine to check it out.
  */
 int
-uha_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+uha_isa_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	struct uha_softc sc;
@@ -105,9 +103,7 @@ uha_isa_probe(parent, match, aux)
  * Attach all the sub-devices we can find
  */
 void
-uha_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+uha_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	struct uha_softc *sc = (void *)self;
@@ -148,10 +144,7 @@ uha_isa_attach(parent, self, aux)
  * Start the board, ready for normal operation
  */
 int
-u14_find(iot, ioh, sc)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	struct uha_softc *sc;
+u14_find(bus_space_tag_t iot, bus_space_handle_t ioh, struct uha_softc *sc)
 {
 	u_int16_t model, config;
 	int irq, drq;
@@ -237,9 +230,7 @@ u14_find(iot, ioh, sc)
  * Function to send a command out through a mailbox
  */
 void
-u14_start_mbox(sc, mscp)
-	struct uha_softc *sc;
-	struct uha_mscp *mscp;
+u14_start_mbox(struct uha_softc *sc, struct uha_mscp *mscp)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -270,10 +261,7 @@ u14_start_mbox(sc, mscp)
  *	wait = timeout in msec
  */
 int
-u14_poll(sc, xs, count)
-	struct uha_softc *sc;
-	struct scsi_xfer *xs;
-	int count;
+u14_poll(struct uha_softc *sc, struct scsi_xfer *xs, int count)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -297,8 +285,7 @@ u14_poll(sc, xs, count)
  * Catch an interrupt from the adaptor
  */
 int
-u14_intr(arg)
-	void *arg;
+u14_intr(void *arg)
 {
 	struct uha_softc *sc = arg;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -347,8 +334,7 @@ u14_intr(arg)
 }
 
 void
-u14_init(sc)
-	struct uha_softc *sc;
+u14_init(struct uha_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c
index dbe07bcb82c..2d07b72667e 100644
--- a/sys/dev/isa/wdc_isapnp.c
+++ b/sys/dev/isa/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_isapnp.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: wdc_isapnp.c,v 1.12 2021/03/07 06:17:04 jsg Exp $	*/
 /*	$NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $	*/
 
 /*-
@@ -62,10 +62,7 @@ struct cfattach wdc_isapnp_ca = {
 };
 
 int
-wdc_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+wdc_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ipa = aux;
 
@@ -80,9 +77,7 @@ wdc_isapnp_match(parent, match, aux)
 }
 
 void
-wdc_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+wdc_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct wdc_isapnp_softc *sc = (void *)self;
 	struct isa_attach_args *ipa = aux;