Change function definitions using the identifier-list form used in the

1st edition of Kernighan and Ritchie's The C Programming Language, to
that of the parameter-type-list form described in the ANSI X3.159-1989
standard.

In ISO/IEC 9899:2023 drafts, there is only one form of function definition.
"N2432 Remove support for function definitions with identifier lists".

ok kettenis@

17 files changed, 125 insertions, 366 deletions

diff --git a/sys/arch/sparc64/dev/auxio.c b/sys/arch/sparc64/dev/auxio.c
index 41456366b91..b92995c3695 100644
--- a/sys/arch/sparc64/dev/auxio.c
+++ b/sys/arch/sparc64/dev/auxio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auxio.c,v 1.9 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: auxio.c,v 1.10 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: auxio.c,v 1.1 2000/04/15 03:08:13 mrg Exp $	*/
 
 /*
@@ -73,10 +73,7 @@ struct cfdriver auxio_cd = {
 void auxio_led_blink(void *, int);
 
 int
-auxio_ebus_match(parent, cf, aux)
-	struct device *parent;
-	void *cf;
-	void *aux;
+auxio_ebus_match(struct device *parent, void *cf, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -84,9 +81,7 @@ auxio_ebus_match(parent, cf, aux)
 }
 
 void
-auxio_ebus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+auxio_ebus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct auxio_softc *sc = (struct auxio_softc *)self;
 	struct ebus_attach_args *ea = aux;
@@ -134,10 +129,7 @@ auxio_ebus_attach(parent, self, aux)
 }
 
 int
-auxio_sbus_match(parent, cf, aux)
-	struct device *parent;
-	void *cf;
-	void *aux;
+auxio_sbus_match(struct device *parent, void *cf, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 
@@ -145,9 +137,7 @@ auxio_sbus_match(parent, cf, aux)
 }
 
 void
-auxio_sbus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+auxio_sbus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct auxio_softc *sc = (struct auxio_softc *)self;
 	struct sbus_attach_args *sa = aux;
@@ -176,8 +166,7 @@ auxio_sbus_attach(parent, self, aux)
 }
 
 void
-auxio_attach_common(sc)
-	struct auxio_softc *sc;
+auxio_attach_common(struct auxio_softc *sc)
 {
 	sc->sc_blink.bl_func = auxio_led_blink;
 	sc->sc_blink.bl_arg = sc;
diff --git a/sys/arch/sparc64/dev/beep.c b/sys/arch/sparc64/dev/beep.c
index 07c45652bc9..0e535271d74 100644
--- a/sys/arch/sparc64/dev/beep.c
+++ b/sys/arch/sparc64/dev/beep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: beep.c,v 1.10 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: beep.c,v 1.11 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -102,9 +102,7 @@ beep_match(struct device *parent, void *match, void *aux)
 }
 
 void
-beep_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+beep_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct beep_softc *sc = (void *)self;
 	struct ebus_attach_args *ea = aux;
diff --git a/sys/arch/sparc64/dev/beeper.c b/sys/arch/sparc64/dev/beeper.c
index 7109c0f1dd2..0062e9990ce 100644
--- a/sys/arch/sparc64/dev/beeper.c
+++ b/sys/arch/sparc64/dev/beeper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: beeper.c,v 1.14 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: beeper.c,v 1.15 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -82,10 +82,7 @@ void beeper_bell(void *, u_int, u_int, u_int, int);
 #endif
 
 int
-beeper_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+beeper_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -95,9 +92,7 @@ beeper_match(parent, match, aux)
 }
 
 void
-beeper_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+beeper_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct beeper_softc *sc = (void *)self;
 	struct ebus_attach_args *ea = aux;
@@ -127,8 +122,7 @@ beeper_attach(parent, self, aux)
 
 #if NPCKBD > 0
 void
-beeper_stop(vsc)
-	void *vsc;
+beeper_stop(void *vsc)
 {
 	struct beeper_softc *sc = vsc;
 	int s;
@@ -141,10 +135,7 @@ beeper_stop(vsc)
 }
 
 void
-beeper_bell(vsc, pitch, period, volume, poll)
-	void *vsc;
-	u_int pitch, period, volume;
-	int poll;
+beeper_bell(void *vsc, u_int pitch, u_int period, u_int volume, int poll)
 {
 	struct beeper_softc *sc = vsc;
 	int s;
diff --git a/sys/arch/sparc64/dev/central.c b/sys/arch/sparc64/dev/central.c
index aac9725ad8d..471deeaab67 100644
--- a/sys/arch/sparc64/dev/central.c
+++ b/sys/arch/sparc64/dev/central.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: central.c,v 1.11 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: central.c,v 1.12 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net)
@@ -60,9 +60,7 @@ int _central_bus_map(bus_space_tag_t, bus_space_tag_t, bus_addr_t, bus_size_t,
     int, bus_space_handle_t *);
 
 int
-central_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+central_match(struct device *parent, void *match, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -72,9 +70,7 @@ central_match(parent, match, aux)
 }
 
 void
-central_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+central_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct central_softc *sc = (struct central_softc *)self;
 	struct mainbus_attach_args *ma = aux;
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index d149cb3842c..2f77166f0c9 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: creator.c,v 1.55 2022/07/15 17:57:26 kettenis Exp $	*/
+/*	$OpenBSD: creator.c,v 1.56 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -82,9 +82,7 @@ const struct cfattach creator_ca = {
 };
 
 int
-creator_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+creator_match(struct device *parent, void *match, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -95,9 +93,7 @@ creator_match(parent, match, aux)
 }
 
 void
-creator_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+creator_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct creator_softc *sc = (struct creator_softc *)self;
 	struct mainbus_attach_args *ma = aux;
@@ -219,12 +215,7 @@ unmap_dfb24:
 }
 
 int
-creator_ioctl(v, cmd, data, flags, p)
-	void *v;
-	u_long cmd;
-	caddr_t data;
-	int flags;
-	struct proc *p;
+creator_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct creator_softc *sc = v;
 	struct wsdisplay_cursor *curs;
@@ -489,10 +480,7 @@ const struct creator_mappings {
 #define	CREATOR_NMAPPINGS       nitems(creator_map)
 
 paddr_t
-creator_mmap(vsc, off, prot)
-	void *vsc;
-	off_t off;
-	int prot;
+creator_mmap(void *vsc, off_t off, int prot)
 {
 	paddr_t x;
 	struct creator_softc *sc = vsc;
@@ -541,9 +529,7 @@ creator_mmap(vsc, off, prot)
 }
 
 void
-creator_ras_fifo_wait(sc, n)
-	struct creator_softc *sc;
-	int n;
+creator_ras_fifo_wait(struct creator_softc *sc, int n)
 {
 	int32_t cache = sc->sc_fifo_cache;
 
@@ -557,8 +543,7 @@ creator_ras_fifo_wait(sc, n)
 }
 
 void
-creator_ras_wait(sc)
-	struct creator_softc *sc;
+creator_ras_wait(struct creator_softc *sc)
 {
 	u_int32_t ucsr, r;
 
@@ -573,8 +558,7 @@ creator_ras_wait(sc)
 }
 
 void
-creator_ras_init(sc)
-	struct creator_softc *sc;
+creator_ras_init(struct creator_softc *sc)
 {
 	creator_ras_fifo_wait(sc, 7);
 	FBC_WRITE(sc, FFB_FBC_PPC,
@@ -593,10 +577,7 @@ creator_ras_init(sc)
 }
 
 int
-creator_ras_eraserows(cookie, row, n, attr)
-	void *cookie;
-	int row, n;
-	uint32_t attr;
+creator_ras_eraserows(void *cookie, int row, int n, uint32_t attr)
 {
 	struct rasops_info *ri = cookie;
 	struct creator_softc *sc = ri->ri_hw;
@@ -633,10 +614,7 @@ creator_ras_eraserows(cookie, row, n, attr)
 }
 
 int
-creator_ras_erasecols(cookie, row, col, n, attr)
-	void *cookie;
-	int row, col, n;
-	uint32_t attr;
+creator_ras_erasecols(void *cookie, int row, int col, int n, uint32_t attr)
 {
 	struct rasops_info *ri = cookie;
 	struct creator_softc *sc = ri->ri_hw;
@@ -670,8 +648,7 @@ creator_ras_erasecols(cookie, row, col, n, attr)
 }
 
 void
-creator_ras_fill(sc)
-	struct creator_softc *sc;
+creator_ras_fill(struct creator_softc *sc)
 {
 	creator_ras_fifo_wait(sc, 2);
 	FBC_WRITE(sc, FFB_FBC_ROP, FBC_ROP_NEW);
@@ -680,9 +657,7 @@ creator_ras_fill(sc)
 }
 
 int
-creator_ras_copyrows(cookie, src, dst, n)
-	void *cookie;
-	int src, dst, n;
+creator_ras_copyrows(void *cookie, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
 	struct creator_softc *sc = ri->ri_hw;
@@ -722,9 +697,7 @@ creator_ras_copyrows(cookie, src, dst, n)
 }
 
 void
-creator_ras_setfg(sc, fg)
-	struct creator_softc *sc;
-	int32_t fg;
+creator_ras_setfg(struct creator_softc *sc, int32_t fg)
 {
 	creator_ras_fifo_wait(sc, 1);
 	if (fg == sc->sc_fg_cache)
diff --git a/sys/arch/sparc64/dev/fhc_central.c b/sys/arch/sparc64/dev/fhc_central.c
index df5e82030e4..0e4b19b3f51 100644
--- a/sys/arch/sparc64/dev/fhc_central.c
+++ b/sys/arch/sparc64/dev/fhc_central.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fhc_central.c,v 1.7 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: fhc_central.c,v 1.8 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net).
@@ -49,9 +49,7 @@ const struct cfattach fhc_central_ca = {
 };
 
 int
-fhc_central_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+fhc_central_match(struct device *parent, void *match, void *aux)
 {
 	struct central_attach_args *ca = aux;
 
@@ -61,9 +59,7 @@ fhc_central_match(parent, match, aux)
 }
 
 void
-fhc_central_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+fhc_central_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct fhc_softc *sc = (struct fhc_softc *)self;
 	struct central_attach_args *ca = aux;
diff --git a/sys/arch/sparc64/dev/fhc_mainbus.c b/sys/arch/sparc64/dev/fhc_mainbus.c
index d33d41cd0e4..4cc7c458c57 100644
--- a/sys/arch/sparc64/dev/fhc_mainbus.c
+++ b/sys/arch/sparc64/dev/fhc_mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fhc_mainbus.c,v 1.6 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: fhc_mainbus.c,v 1.7 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net).
@@ -47,9 +47,7 @@ const struct cfattach fhc_mainbus_ca = {
 };
 
 int
-fhc_mainbus_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+fhc_mainbus_match(struct device *parent, void *match, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -59,9 +57,7 @@ fhc_mainbus_match(parent, match, aux)
 }
 
 void
-fhc_mainbus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+fhc_mainbus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct fhc_softc *sc = (struct fhc_softc *)self;
 	struct mainbus_attach_args *ma = aux;
diff --git a/sys/arch/sparc64/dev/lpt_ebus.c b/sys/arch/sparc64/dev/lpt_ebus.c
index 86988c8be05..853f1b19f87 100644
--- a/sys/arch/sparc64/dev/lpt_ebus.c
+++ b/sys/arch/sparc64/dev/lpt_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_ebus.c,v 1.11 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: lpt_ebus.c,v 1.12 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: lpt_ebus.c,v 1.8 2002/03/01 11:51:00 martin Exp $	*/
 
 /*
@@ -56,10 +56,7 @@ const struct cfattach lpt_ebus_ca = {
 };
 
 int
-lpt_ebus_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+lpt_ebus_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -70,9 +67,7 @@ lpt_ebus_match(parent, match, aux)
 }
 
 void
-lpt_ebus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+lpt_ebus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct lpt_ebus_softc *sc = (void *)self;
 	struct ebus_attach_args *ea = aux;
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index 9281dbd0299..9fd02e1a0c8 100644
--- a/sys/arch/sparc64/dev/pci_machdep.c
+++ b/sys/arch/sparc64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.51 2020/06/23 01:21:29 jmatthew Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.52 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $	*/
 
 /*
@@ -77,10 +77,8 @@ static int pci_bus_frequency(int node);
  */
 
 void
-pci_attach_hook(parent, self, pba)
-	struct device *parent;
-	struct device *self;
-	struct pcibus_attach_args *pba;
+pci_attach_hook(struct device *parent, struct device *self,
+    struct pcibus_attach_args *pba)
 {
 	/* Don't do anything */
 }
@@ -126,20 +124,14 @@ pci_probe_device_hook(pci_chipset_tag_t pc, struct pci_attach_args *pa)
 }
 
 int
-pci_bus_maxdevs(pc, busno)
-	pci_chipset_tag_t pc;
-	int busno;
+pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
 {
 
 	return 32;
 }
 
 pcitag_t
-pci_make_tag(pc, b, d, f)
-	pci_chipset_tag_t pc;
-	int b;
-	int d;
-	int f;
+pci_make_tag(pci_chipset_tag_t pc, int b, int d, int f)
 {
 	struct ofw_pci_register reg;
 	pcitag_t tag;
@@ -226,10 +218,7 @@ pci_make_tag(pc, b, d, f)
 }
 
 void
-pci_decompose_tag(pc, tag, bp, dp, fp)
-	pci_chipset_tag_t pc;
-	pcitag_t tag;
-	int *bp, *dp, *fp;
+pci_decompose_tag(pci_chipset_tag_t pc, pcitag_t tag, int *bp, int *dp, int *fp)
 {
 
 	if (bp != NULL)
@@ -387,9 +376,7 @@ pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t data)
  * XXX: how does this deal with multiple interrupts for a device?
  */
 int
-pci_intr_map(pa, ihp)
-	struct pci_attach_args *pa;
-	pci_intr_handle_t *ihp;
+pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
 	pcitag_t tag = pa->pa_tag;
 	int interrupts[4], ninterrupts;
@@ -490,9 +477,7 @@ pci_intr_line(pci_chipset_tag_t pc, pci_intr_handle_t ih)
 }
 
 const char *
-pci_intr_string(pc, ih)
-	pci_chipset_tag_t pc;
-	pci_intr_handle_t ih;
+pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
 {
 	static char str[16];
 	const char *rv = str;
@@ -515,13 +500,8 @@ pci_intr_string(pc, ih)
 }
 
 void *
-pci_intr_establish(pc, ih, level, func, arg, what)
-	pci_chipset_tag_t pc;
-	pci_intr_handle_t ih;
-	int level;
-	int (*func)(void *);
-	void *arg;
-	const char *what;
+pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level,
+    int (*func)(void *), void *arg, const char *what)
 {
 	return (pci_intr_establish_cpu(pc, ih, level, NULL, func, arg, what));
 }
@@ -549,9 +529,7 @@ pci_intr_establish_cpu(pci_chipset_tag_t pc, pci_intr_handle_t ih,
 }
 
 void
-pci_intr_disestablish(pc, cookie)
-	pci_chipset_tag_t pc;
-	void *cookie;
+pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
 {
 
 	DPRINTF(SPDB_INTR, ("pci_intr_disestablish: cookie %p\n", cookie));
diff --git a/sys/arch/sparc64/dev/pckbc_ebus.c b/sys/arch/sparc64/dev/pckbc_ebus.c
index c3f4ff14d21..9dbc8e79695 100644
--- a/sys/arch/sparc64/dev/pckbc_ebus.c
+++ b/sys/arch/sparc64/dev/pckbc_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pckbc_ebus.c,v 1.15 2021/10/24 17:05:03 mpi Exp $	*/
+/*	$OpenBSD: pckbc_ebus.c,v 1.16 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -72,10 +72,7 @@ const struct cfattach pckbc_ebus_ca = {
 int pckbc_ebus_is_console(struct pckbc_ebus_softc *);
 
 int
-pckbc_ebus_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+pckbc_ebus_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -85,9 +82,7 @@ pckbc_ebus_match(parent, match, aux)
 }
 
 void
-pckbc_ebus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pckbc_ebus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct pckbc_ebus_softc *sc = (void *)self;
 	struct pckbc_softc *psc = &sc->sc_pckbc;
@@ -183,8 +178,7 @@ pckbc_ebus_attach(parent, self, aux)
 }
 
 int
-pckbc_ebus_is_console(sc)
-	struct pckbc_ebus_softc *sc;
+pckbc_ebus_is_console(struct pckbc_ebus_softc *sc)
 {
 	char *name;
 	int node;
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index 84506f28f44..f212a3058d7 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcons.c,v 1.26 2021/10/24 17:05:04 mpi Exp $	*/
+/*	$OpenBSD: pcons.c,v 1.27 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $	*/
 
 /*-
@@ -148,10 +148,7 @@ extern struct consdev *cn_tab;
 cons_decl(prom_);
 
 int
-pconsmatch(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+pconsmatch(struct device *parent, void *match, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -163,9 +160,7 @@ pconsmatch(parent, match, aux)
 void pcons_poll(void *);
 
 void
-pconsattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pconsattach(struct device *parent, struct device *self, void *aux)
 {
 	struct pconssoftc *sc = (struct pconssoftc *) self;
 #if NWSDISPLAY > 0
@@ -206,10 +201,7 @@ void pconsstart(struct tty *);
 int pconsparam(struct tty *, struct termios *);
 
 int
-pconsopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
+pconsopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct pconssoftc *sc;
 	int unit = minor(dev);
@@ -253,10 +245,7 @@ pconsopen(dev, flag, mode, p)
 }
 
 int
-pconsclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
+pconsclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
 	struct tty *tp = sc->of_tty;
@@ -269,10 +258,7 @@ pconsclose(dev, flag, mode, p)
 }
 
 int
-pconsread(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
+pconsread(dev_t dev, struct uio *uio, int flag)
 {
 	struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
 	struct tty *tp = sc->of_tty;
@@ -281,10 +267,7 @@ pconsread(dev, uio, flag)
 }
 
 int
-pconswrite(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
+pconswrite(dev_t dev, struct uio *uio, int flag)
 {
 	struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
 	struct tty *tp = sc->of_tty;
@@ -293,12 +276,7 @@ pconswrite(dev, uio, flag)
 }
 
 int
-pconsioctl(dev, cmd, data, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct proc *p;
+pconsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
 	struct tty *tp = sc->of_tty;
@@ -312,8 +290,7 @@ pconsioctl(dev, cmd, data, flag, p)
 }
 
 struct tty *
-pconstty(dev)
-	dev_t dev;
+pconstty(dev_t dev)
 {
 	struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
 
@@ -321,16 +298,13 @@ pconstty(dev)
 }
 
 int
-pconsstop(tp, flag)
-	struct tty *tp;
-	int flag;
+pconsstop(struct tty *tp, int flag)
 {
 	return 0;
 }
 
 void
-pconsstart(tp)
-	struct tty *tp;
+pconsstart(struct tty *tp)
 {
 	struct clist *cl;
 	int s, len;
@@ -363,9 +337,7 @@ pconsstart(tp)
 }
 
 int
-pconsparam(tp, t)
-	struct tty *tp;
-	struct termios *t;
+pconsparam(struct tty *tp, struct termios *t)
 {
 	tp->t_ispeed = t->c_ispeed;
 	tp->t_ospeed = t->c_ospeed;
@@ -374,8 +346,7 @@ pconsparam(tp, t)
 }
 
 void
-pcons_poll(aux)
-	void *aux;
+pcons_poll(void *aux)
 {
 	struct pconssoftc *sc = aux;
 	struct tty *tp = sc->of_tty;
@@ -402,9 +373,7 @@ pconsprobe(void)
 }
 
 void
-pcons_cnpollc(dev, on)
-	dev_t dev;
-	int on;
+pcons_cnpollc(dev_t dev, int on)
 {
 	struct pconssoftc *sc = NULL;
 
diff --git a/sys/arch/sparc64/dev/power.c b/sys/arch/sparc64/dev/power.c
index cf7eeaed929..701c410a7af 100644
--- a/sys/arch/sparc64/dev/power.c
+++ b/sys/arch/sparc64/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.9 2021/10/24 17:05:04 mpi Exp $	*/
+/*	$OpenBSD: power.c,v 1.10 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -71,10 +71,7 @@ struct cfdriver power_cd = {
 };
 
 int
-power_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+power_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -84,9 +81,7 @@ power_match(parent, match, aux)
 }
 
 void
-power_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+power_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct power_softc *sc = (void *)self;
 	struct ebus_attach_args *ea = aux;
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index d0baebb2c78..139aa489d9e 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.80 2022/02/21 11:09:52 jsg Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.81 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -721,9 +721,7 @@ psycho_alloc_chipset(struct psycho_pbm *pp, int node, pci_chipset_tag_t pc)
  * grovel the OBP for various psycho properties
  */
 void
-psycho_get_bus_range(node, brp)
-	int node;
-	int *brp;
+psycho_get_bus_range(int node, int *brp)
 {
 	int n, error;
 
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index d3e00a3ded6..73ef07db8b4 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sab.c,v 1.39 2021/10/24 17:05:04 mpi Exp $	*/
+/*	$OpenBSD: sab.c,v 1.40 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -209,9 +209,7 @@ struct sabtty_rate sabtty_baudtable[] = {
 };
 
 int
-sab_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+sab_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 	char *compat;
@@ -226,10 +224,7 @@ sab_match(parent, match, aux)
 }
 
 void
-sab_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+sab_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sab_softc *sc = (struct sab_softc *)self;
 	struct ebus_attach_args *ea = aux;
@@ -324,9 +319,7 @@ sabtty_activate(struct device *self, int act)
 }
 
 int
-sab_print(args, name)
-	void *args;
-	const char *name;
+sab_print(void *args, const char *name)
 {
 	struct sabtty_attach_args *sa = args;
 
@@ -337,8 +330,7 @@ sab_print(args, name)
 }
 
 int
-sab_intr(vsc)
-	void *vsc;
+sab_intr(void *vsc)
 {
 	struct sab_softc *sc = vsc;
 	int r = 0, needsoft = 0;
@@ -363,8 +355,7 @@ sab_intr(vsc)
 }
 
 void
-sab_softintr(vsc)
-	void *vsc;
+sab_softintr(void *vsc)
 {
 	struct sab_softc *sc = vsc;
 
@@ -375,9 +366,7 @@ sab_softintr(vsc)
 }
 
 int
-sabtty_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+sabtty_match(struct device *parent, void *match, void *aux)
 {
 	struct sabtty_attach_args *sa = aux;
 
@@ -387,10 +376,7 @@ sabtty_match(parent, match, aux)
 }
 
 void
-sabtty_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+sabtty_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sabtty_softc *sc = (struct sabtty_softc *)self;
 	struct sabtty_attach_args *sa = aux;
@@ -480,9 +466,7 @@ sabtty_attach(parent, self, aux)
 }
 
 int
-sabtty_intr(sc, needsoftp)
-	struct sabtty_softc *sc;
-	int *needsoftp;
+sabtty_intr(struct sabtty_softc *sc, int *needsoftp)
 {
 	u_int8_t isr0, isr1;
 	int i, len = 0, needsoft = 0, r = 0, clearfifo = 0;
@@ -591,8 +575,7 @@ sabtty_intr(sc, needsoftp)
 }
 
 void
-sabtty_softintr(sc)
-	struct sabtty_softc *sc;
+sabtty_softintr(struct sabtty_softc *sc)
 {
 	struct tty *tp = sc->sc_tty;
 	int s, flags;
@@ -645,10 +628,7 @@ sabtty_softintr(sc)
 }
 
 int
-sabttyopen(dev, flags, mode, p)
-	dev_t dev;
-	int flags, mode;
-	struct proc *p;
+sabttyopen(dev_t dev, int flags, int mode, struct proc *p)
 {
 	struct sab_softc *bc;
 	struct sabtty_softc *sc;
@@ -763,10 +743,7 @@ sabttyopen(dev, flags, mode, p)
 }
 
 int
-sabttyclose(dev, flags, mode, p)
-	dev_t dev;
-	int flags, mode;
-	struct proc *p;
+sabttyclose(dev_t dev, int flags, int mode, struct proc *p)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(dev)];
@@ -806,10 +783,7 @@ sabttyclose(dev, flags, mode, p)
 }
 
 int
-sabttyread(dev, uio, flags)
-	dev_t dev;
-	struct uio *uio;
-	int flags;
+sabttyread(dev_t dev, struct uio *uio, int flags)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(dev)];
@@ -819,10 +793,7 @@ sabttyread(dev, uio, flags)
 }
 
 int
-sabttywrite(dev, uio, flags)
-	dev_t dev;
-	struct uio *uio;
-	int flags;
+sabttywrite(dev_t dev, struct uio *uio, int flags)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(dev)];
@@ -832,12 +803,7 @@ sabttywrite(dev, uio, flags)
 }
 
 int
-sabttyioctl(dev, cmd, data, flags, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flags;
-	struct proc *p;
+sabttyioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(dev)];
@@ -900,8 +866,7 @@ sabttyioctl(dev, cmd, data, flags, p)
 }
 
 struct tty *
-sabttytty(dev)
-	dev_t dev;
+sabttytty(dev_t dev)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(dev)];
@@ -910,9 +875,7 @@ sabttytty(dev)
 }
 
 int
-sabttystop(tp, flags)
-	struct tty *tp;
-	int flags;
+sabttystop(struct tty *tp, int flags)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(tp->t_dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(tp->t_dev)];
@@ -931,9 +894,7 @@ sabttystop(tp, flags)
 }
 
 int
-sabtty_mdmctrl(sc, bits, how)
-	struct sabtty_softc *sc;
-	int bits, how;
+sabtty_mdmctrl(struct sabtty_softc *sc, int bits, int how)
 {
 	u_int8_t r;
 	int s;
@@ -1004,10 +965,7 @@ sabtty_mdmctrl(sc, bits, how)
 }
 
 int
-sabttyparam(sc, tp, t)
-	struct sabtty_softc *sc;
-	struct tty *tp;
-	struct termios *t;
+sabttyparam(struct sabtty_softc *sc, struct tty *tp, struct termios *t)
 {
 	int s, ospeed;
 	tcflag_t cflag;
@@ -1091,9 +1049,7 @@ sabttyparam(sc, tp, t)
 }
 
 int
-sabtty_param(tp, t)
-	struct tty *tp;
-	struct termios *t;
+sabtty_param(struct tty *tp, struct termios *t)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(tp->t_dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(tp->t_dev)];
@@ -1102,8 +1058,7 @@ sabtty_param(tp, t)
 }
 
 void
-sabtty_start(tp)
-	struct tty *tp;
+sabtty_start(struct tty *tp)
 {
 	struct sab_softc *bc = sab_cd.cd_devs[SAB_CARD(tp->t_dev)];
 	struct sabtty_softc *sc = bc->sc_child[SAB_PORT(tp->t_dev)];
@@ -1152,8 +1107,7 @@ sabtty_tec_wait(struct sabtty_softc *sc)
 }
 
 void
-sabtty_reset(sc)
-	struct sabtty_softc *sc;
+sabtty_reset(struct sabtty_softc *sc)
 {
 	/* power down */
 	SAB_WRITE(sc, SAB_CCR0, 0);
@@ -1178,8 +1132,7 @@ sabtty_reset(sc)
 }
 
 void
-sabtty_flush(sc)
-	struct sabtty_softc *sc;
+sabtty_flush(struct sabtty_softc *sc)
 {
 	/* clear rx fifo */
 	sabtty_cec_wait(sc);
@@ -1191,8 +1144,7 @@ sabtty_flush(sc)
 }
 
 int
-sabtty_speed(rate)
-	int rate;
+sabtty_speed(int rate)
 {
 	int i, len, r;
 
@@ -1210,9 +1162,7 @@ sabtty_speed(rate)
 }
 
 void
-sabtty_cnputc(sc, c)
-	struct sabtty_softc *sc;
-	int c;
+sabtty_cnputc(struct sabtty_softc *sc, int c)
 {
 	sabtty_tec_wait(sc);
 	SAB_WRITE(sc, SAB_TIC, c);
@@ -1220,8 +1170,7 @@ sabtty_cnputc(sc, c)
 }
 
 int
-sabtty_cngetc(sc)
-	struct sabtty_softc *sc;
+sabtty_cngetc(struct sabtty_softc *sc)
 {
 	u_int8_t r, len, ipc;
 
@@ -1261,9 +1210,7 @@ again:
 }
 
 void
-sabtty_cnpollc(sc, on)
-	struct sabtty_softc *sc;
-	int on;
+sabtty_cnpollc(struct sabtty_softc *sc, int on)
 {
 	u_int8_t r;
 
@@ -1289,9 +1236,7 @@ sabtty_cnpollc(sc, on)
 }
 
 void
-sab_cnputc(dev, c)
-	dev_t dev;
-	int c;
+sab_cnputc(dev_t dev, int c)
 {
 	struct sabtty_softc *sc = sabtty_cons_output;
 
@@ -1301,9 +1246,7 @@ sab_cnputc(dev, c)
 }
 
 void
-sab_cnpollc(dev, on)
-	dev_t dev;
-	int on;
+sab_cnpollc(dev_t dev, int on)
 {
 	struct sabtty_softc *sc = sabtty_cons_input;
 
@@ -1311,8 +1254,7 @@ sab_cnpollc(dev, on)
 }
 
 int
-sab_cngetc(dev)
-	dev_t dev;
+sab_cngetc(dev_t dev)
 {
 	struct sabtty_softc *sc = sabtty_cons_input;
 
@@ -1322,8 +1264,7 @@ sab_cngetc(dev)
 }
 
 void
-sabtty_console_flags(sc)
-	struct sabtty_softc *sc;
+sabtty_console_flags(struct sabtty_softc *sc)
 {
 	int node, channel, options, cookie;
 	char buf[255];
@@ -1362,8 +1303,7 @@ sabtty_console_flags(sc)
 }
 
 void
-sabtty_console_speed(sc)
-	struct sabtty_softc *sc;
+sabtty_console_speed(struct sabtty_softc *sc)
 {
 	char *name;
 	int node, channel, options;
@@ -1386,8 +1326,7 @@ sabtty_console_speed(sc)
 }
 
 void
-sabtty_abort(sc)
-	struct sabtty_softc *sc;
+sabtty_abort(struct sabtty_softc *sc)
 {
 
 	if (sc->sc_flags & SABTTYF_CONS_IN) {
diff --git a/sys/arch/sparc64/dev/stp_sbus.c b/sys/arch/sparc64/dev/stp_sbus.c
index 34d962c1ddf..cbbb5175685 100644
--- a/sys/arch/sparc64/dev/stp_sbus.c
+++ b/sys/arch/sparc64/dev/stp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stp_sbus.c,v 1.12 2021/10/24 17:05:04 mpi Exp $	*/
+/*	$OpenBSD: stp_sbus.c,v 1.13 2022/10/16 01:22:39 jsg Exp $	*/
 /*	$NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $	*/
 
 /*-
@@ -68,10 +68,7 @@ const struct cfattach stp_sbus_ca = {
 };
 
 int
-stpmatch(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+stpmatch(struct device *parent, void *match, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 
@@ -82,9 +79,7 @@ stpmatch(parent, match, aux)
  * Attach all the sub-devices we can find
  */
 void
-stpattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+stpattach(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct stp4020_sbus_softc *ssc = (void *)self;
diff --git a/sys/arch/sparc64/dev/uperf.c b/sys/arch/sparc64/dev/uperf.c
index cb39277e96d..13a0a222276 100644
--- a/sys/arch/sparc64/dev/uperf.c
+++ b/sys/arch/sparc64/dev/uperf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: uperf.c,v 1.9 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -55,10 +55,7 @@ int uperf_findbysrc(struct uperf_softc *, int, int, u_int32_t *);
 int uperf_setcntsrc(struct uperf_softc *, struct uperf_io *);
 
 int
-uperfopen(dev, flags, mode, p)
-	dev_t dev;
-	int flags, mode;
-	struct proc *p;
+uperfopen(dev_t dev, int flags, int mode, struct proc *p)
 {
 	if (minor(dev) >= uperf_cd.cd_ndevs)
 		return (ENXIO);
@@ -68,21 +65,13 @@ uperfopen(dev, flags, mode, p)
 }
 
 int
-uperfclose(dev, flags, mode, p)
-	dev_t dev;
-	int flags, mode;
-	struct proc *p;
+uperfclose(dev_t dev, int flags, int mode, struct proc *p)
 {
 	return (0);
 }
 
 int
-uperfioctl(dev, cmd, data, flags, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flags;
-	struct proc *p;
+uperfioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct uperf_softc *usc = uperf_cd.cd_devs[minor(dev)];
 	struct uperf_io *io = (struct uperf_io *)data;
@@ -108,9 +97,7 @@ uperfioctl(dev, cmd, data, flags, p)
 }
 
 int
-uperf_getcntsrc(usc, io)
-	struct uperf_softc *usc;
-	struct uperf_io *io;
+uperf_getcntsrc(struct uperf_softc *usc, struct uperf_io *io)
 {
 	u_int cnt0_src, cnt1_src;
 	int error;
@@ -137,11 +124,7 @@ uperf_getcntsrc(usc, io)
 }
 
 int
-uperf_findbyval(usc, cnt, uval, rval)
-	struct uperf_softc *usc;
-	int cnt;
-	u_int uval;
-	int *rval;
+uperf_findbyval(struct uperf_softc *usc, int cnt, u_int uval, int *rval)
 {
 	struct uperf_src *srcs = usc->usc_srcs;
 
@@ -159,9 +142,7 @@ uperf_findbyval(usc, cnt, uval, rval)
 }
 
 int
-uperf_setcntsrc(usc, io)
-	struct uperf_softc *usc;
-	struct uperf_io *io;
+uperf_setcntsrc(struct uperf_softc *usc, struct uperf_io *io)
 {
 	u_int32_t cnt0_src, cnt1_src;
 	int error;
@@ -185,10 +166,7 @@ uperf_setcntsrc(usc, io)
 }
 
 int
-uperf_findbysrc(usc, cnt, src, rval)
-	struct uperf_softc *usc;
-	int cnt, src;
-	u_int32_t *rval;
+uperf_findbysrc(struct uperf_softc *usc, int cnt, int src, u_int32_t *rval)
 {
 	struct uperf_src *srcs = usc->usc_srcs;
 
diff --git a/sys/arch/sparc64/dev/uperf_ebus.c b/sys/arch/sparc64/dev/uperf_ebus.c
index 0bcd4fdff35..213e6703494 100644
--- a/sys/arch/sparc64/dev/uperf_ebus.c
+++ b/sys/arch/sparc64/dev/uperf_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf_ebus.c,v 1.8 2021/10/24 17:05:04 mpi Exp $	*/
+/*	$OpenBSD: uperf_ebus.c,v 1.9 2022/10/16 01:22:39 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -110,10 +110,7 @@ struct uperf_src uperf_ebus_srcs[] = {
 	{ -1, -1, 0 }
 };
 int
-uperf_ebus_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+uperf_ebus_match(struct device *parent, void *match, void *aux)
 {
 	struct ebus_attach_args *ea = aux;
 
@@ -121,9 +118,7 @@ uperf_ebus_match(parent, match, aux)
 }
 
 void
-uperf_ebus_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+uperf_ebus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct uperf_ebus_softc *sc = (void *)self;
 	struct ebus_attach_args *ea = aux;
@@ -170,9 +165,7 @@ uperf_ebus_attach(parent, self, aux)
  * Read an indirect register.
  */
 u_int32_t
-uperf_ebus_read_reg(sc, r)
-	struct uperf_ebus_softc *sc;
-	bus_size_t r;
+uperf_ebus_read_reg(struct uperf_ebus_softc *sc, bus_size_t r)
 {
 	u_int32_t v;
 	int s;
@@ -211,10 +204,7 @@ uperf_ebus_read_reg(sc, r)
  * Write an indirect register.
  */
 void
-uperf_ebus_write_reg(sc, r, v)
-	struct uperf_ebus_softc *sc;
-	bus_size_t r;
-	u_int32_t v;
+uperf_ebus_write_reg(struct uperf_ebus_softc *sc, bus_size_t r, u_int32_t v)
 {
 	int s;
 
@@ -248,9 +238,7 @@ uperf_ebus_write_reg(sc, r, v)
 }
 
 int
-uperf_ebus_clrcnt(vsc, flags)
-	void *vsc;
-	int flags;
+uperf_ebus_clrcnt(void *vsc, int flags)
 {
 	struct uperf_ebus_softc *sc = vsc;
 	u_int32_t clr = 0, oldsrc;
@@ -267,10 +255,7 @@ uperf_ebus_clrcnt(vsc, flags)
 }
 
 int
-uperf_ebus_setcntsrc(vsc, flags, src0, src1)
-	void *vsc;
-	int flags;
-	u_int src0, src1;
+uperf_ebus_setcntsrc(void *vsc, int flags, u_int src0, u_int src1)
 {
 	struct uperf_ebus_softc *sc = vsc;
 	u_int32_t src;
@@ -289,10 +274,7 @@ uperf_ebus_setcntsrc(vsc, flags, src0, src1)
 }
 
 int
-uperf_ebus_getcntsrc(vsc, flags, srcp0, srcp1)
-	void *vsc;
-	int flags;
-	u_int *srcp0, *srcp1;
+uperf_ebus_getcntsrc(void *vsc, int flags, u_int *srcp0, u_int *srcp1)
 {
 	struct uperf_ebus_softc *sc = vsc;
 	u_int32_t src;
@@ -306,10 +288,7 @@ uperf_ebus_getcntsrc(vsc, flags, srcp0, srcp1)
 }
 
 int
-uperf_ebus_getcnt(vsc, flags, cntp0, cntp1)
-	void *vsc;
-	int flags;
-	u_int32_t *cntp0, *cntp1;
+uperf_ebus_getcnt(void *vsc, int flags, u_int32_t *cntp0, u_int32_t *cntp1)
 {
 	struct uperf_ebus_softc *sc = vsc;
 	u_int32_t c0, c1;