First round of __P removal in sys

28 files changed, 380 insertions, 380 deletions

diff --git a/sys/arch/sparc64/dev/auxio.c b/sys/arch/sparc64/dev/auxio.c
index d37d0d4dd41..5b23a0b0ad4 100644
--- a/sys/arch/sparc64/dev/auxio.c
+++ b/sys/arch/sparc64/dev/auxio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auxio.c,v 1.3 2002/02/01 21:48:23 jason Exp $	*/
+/*	$OpenBSD: auxio.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: auxio.c,v 1.1 2000/04/15 03:08:13 mrg Exp $	*/
 
 /*
@@ -54,11 +54,11 @@
 /*
  * ebus code.
  */
-int	auxio_ebus_match __P((struct device *, void *, void *));
-void	auxio_ebus_attach __P((struct device *, struct device *, void *));
-int	auxio_sbus_match __P((struct device *, void *, void *));
-void	auxio_sbus_attach __P((struct device *, struct device *, void *));
-void	auxio_attach_common __P((struct auxio_softc *));
+int	auxio_ebus_match(struct device *, void *, void *);
+void	auxio_ebus_attach(struct device *, struct device *, void *);
+int	auxio_sbus_match(struct device *, void *, void *);
+void	auxio_sbus_attach(struct device *, struct device *, void *);
+void	auxio_attach_common(struct auxio_softc *);
 
 struct cfattach auxio_ebus_ca = {
 	sizeof(struct auxio_softc), auxio_ebus_match, auxio_ebus_attach
diff --git a/sys/arch/sparc64/dev/auxiovar.h b/sys/arch/sparc64/dev/auxiovar.h
index 58f5ef4ca6d..efb9a42495c 100644
--- a/sys/arch/sparc64/dev/auxiovar.h
+++ b/sys/arch/sparc64/dev/auxiovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auxiovar.h,v 1.3 2002/02/01 21:48:23 jason Exp $	*/
+/*	$OpenBSD: auxiovar.h,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: auxiovar.h,v 1.4 2000/04/15 03:08:13 mrg Exp $	*/
 
 /*
@@ -63,6 +63,6 @@ struct auxio_softc {
  * as AUXREG_VA depends on NBPG which is not a constant.
  */
 volatile u_char *auxio_reg;
-unsigned int auxregbisc __P((int, int));
-void auxio_led_blink __P((void *));
+unsigned int auxregbisc(int, int);
+void auxio_led_blink(void *);
 #endif
diff --git a/sys/arch/sparc64/dev/beeper.c b/sys/arch/sparc64/dev/beeper.c
index 1ca05816d6b..8c66982e42d 100644
--- a/sys/arch/sparc64/dev/beeper.c
+++ b/sys/arch/sparc64/dev/beeper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: beeper.c,v 1.3 2002/02/23 04:42:35 jason Exp $	*/
+/*	$OpenBSD: beeper.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -66,8 +66,8 @@ struct beeper_softc {
 
 #define	BEEP_REG	0
 
-int	beeper_match __P((struct device *, void *, void *));
-void	beeper_attach __P((struct device *, struct device *, void *));
+int	beeper_match(struct device *, void *, void *);
+void	beeper_attach(struct device *, struct device *, void *);
 
 struct cfattach beeper_ca = {
 	sizeof(struct beeper_softc), beeper_match, beeper_attach
diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index 73353959070..92146092b3e 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ce4231.c,v 1.5 2002/01/24 03:06:54 jason Exp $	*/
+/*	$OpenBSD: ce4231.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -128,39 +128,39 @@
 #define	C_READ(sc,r)		\
     bus_space_read_4((sc)->sc_bustag, (sc)->sc_cdmahandle, (r))
 
-int	ce4231_match	__P((struct device *, void *, void *));
-void	ce4231_attach	__P((struct device *, struct device *, void *));
-int	ce4231_cintr	__P((void *));
-int	ce4231_pintr	__P((void *));
+int	ce4231_match(struct device *, void *, void *);
+void	ce4231_attach(struct device *, struct device *, void *);
+int	ce4231_cintr(void *);
+int	ce4231_pintr(void *);
 
-int	ce4231_set_speed	__P((struct ce4231_softc *, u_long *));
-void	ce4231_setup_output	__P((struct ce4231_softc *sc));
+int	ce4231_set_speed(struct ce4231_softc *, u_long *);
+void	ce4231_setup_output(struct ce4231_softc *sc);
 
-void		ce4231_write	__P((struct ce4231_softc *, u_int8_t, u_int8_t));
-u_int8_t	ce4231_read	__P((struct ce4231_softc *, u_int8_t));
+void		ce4231_write(struct ce4231_softc *, u_int8_t, u_int8_t);
+u_int8_t	ce4231_read(struct ce4231_softc *, u_int8_t);
 
 /* Audio interface */
-int	ce4231_open		__P((void *, int));
-void	ce4231_close		__P((void *));
-int	ce4231_query_encoding	__P((void *, struct audio_encoding *));
-int	ce4231_set_params	__P((void *, int, int, struct audio_params *,
-    struct audio_params *));
-int	ce4231_round_blocksize	__P((void *, int));
-int	ce4231_commit_settings	__P((void *));
-int	ce4231_halt_output	__P((void *));
-int	ce4231_halt_input	__P((void *));
-int	ce4231_getdev		__P((void *, struct audio_device *));
-int	ce4231_set_port		__P((void *, mixer_ctrl_t *));
-int	ce4231_get_port		__P((void *, mixer_ctrl_t *));
-int	ce4231_query_devinfo	__P((void *addr, mixer_devinfo_t *));
-void *	ce4231_alloc		__P((void *, int, size_t, int, int));
-void	ce4231_free		__P((void *, void *, int));
-size_t	ce4231_round_buffersize	__P((void *, int, size_t));
-int	ce4231_get_props	__P((void *));
+int	ce4231_open(void *, int);
+void	ce4231_close(void *);
+int	ce4231_query_encoding(void *, struct audio_encoding *);
+int	ce4231_set_params(void *, int, int, struct audio_params *,
+    struct audio_params *);
+int	ce4231_round_blocksize(void *, int);
+int	ce4231_commit_settings(void *);
+int	ce4231_halt_output(void *);
+int	ce4231_halt_input(void *);
+int	ce4231_getdev(void *, struct audio_device *);
+int	ce4231_set_port(void *, mixer_ctrl_t *);
+int	ce4231_get_port(void *, mixer_ctrl_t *);
+int	ce4231_query_devinfo(void *addr, mixer_devinfo_t *);
+void *	ce4231_alloc(void *, int, size_t, int, int);
+void	ce4231_free(void *, void *, int);
+size_t	ce4231_round_buffersize(void *, int, size_t);
+int	ce4231_get_props(void *);
 int	ce4231_trigger_output __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 int	ce4231_trigger_input __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 
 struct audio_hw_if ce4231_sa_hw_if = {
 	ce4231_open,
@@ -577,8 +577,8 @@ ce4231_set_params(addr, setmode, usemode, p, r)
 {
 	struct ce4231_softc *sc = (struct ce4231_softc *)addr;
 	int err, bits, enc;
-	void (*pswcode) __P((void *, u_char *, int cnt));
-	void (*rswcode) __P((void *, u_char *, int cnt));
+	void (*pswcode)(void *, u_char *, int cnt);
+	void (*rswcode)(void *, u_char *, int cnt);
 
 	enc = p->encoding;
 	pswcode = rswcode = 0;
@@ -1438,7 +1438,7 @@ int
 ce4231_trigger_output(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {
@@ -1510,7 +1510,7 @@ int
 ce4231_trigger_input(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {
diff --git a/sys/arch/sparc64/dev/com_ebus.c b/sys/arch/sparc64/dev/com_ebus.c
index 27f337dc83a..4da384810da 100644
--- a/sys/arch/sparc64/dev/com_ebus.c
+++ b/sys/arch/sparc64/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_ebus.c,v 1.5 2002/01/25 03:58:39 jason Exp $	*/
+/*	$OpenBSD: com_ebus.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: com_ebus.c,v 1.6 2001/07/24 19:27:10 eeh Exp $	*/
 
 /*
@@ -52,8 +52,8 @@
 
 cdev_decl(com); /* XXX this belongs elsewhere */
 
-int	com_ebus_match __P((struct device *, void *, void *));
-void	com_ebus_attach __P((struct device *, struct device *, void *));
+int	com_ebus_match(struct device *, void *, void *);
+void	com_ebus_attach(struct device *, struct device *, void *);
 
 struct cfattach com_ebus_ca = {
 	sizeof(struct com_softc), com_ebus_match, com_ebus_attach
diff --git a/sys/arch/sparc64/dev/comkbd_ebus.c b/sys/arch/sparc64/dev/comkbd_ebus.c
index de21e56a014..44678859130 100644
--- a/sys/arch/sparc64/dev/comkbd_ebus.c
+++ b/sys/arch/sparc64/dev/comkbd_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comkbd_ebus.c,v 1.4 2002/02/12 16:53:06 jason Exp $	*/
+/*	$OpenBSD: comkbd_ebus.c,v 1.5 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -97,27 +97,27 @@ struct comkbd_softc {
 #define	COM_READ(sc,r) \
     bus_space_read_1((sc)->sc_iot, (sc)->sc_ioh, (r))
 
-int comkbd_match __P((struct device *, void *, void *));
-void comkbd_attach __P((struct device *, struct device *, void *));
-int comkbd_iskbd __P((int));
+int comkbd_match(struct device *, void *, void *);
+void comkbd_attach(struct device *, struct device *, void *);
+int comkbd_iskbd(int);
 
 /* wskbd glue */
-void comkbd_cnpollc __P((void *, int));
-void comkbd_cngetc __P((void *, u_int *, int *));
-int comkbd_enable __P((void *, int));
-void comkbd_setleds __P((void *, int));
-int comkbd_getleds __P((struct comkbd_softc *));
-int comkbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
+void comkbd_cnpollc(void *, int);
+void comkbd_cngetc(void *, u_int *, int *);
+int comkbd_enable(void *, int);
+void comkbd_setleds(void *, int);
+int comkbd_getleds(struct comkbd_softc *);
+int comkbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
 
 /* internals */
-void comkbd_enqueue __P((struct comkbd_softc *, u_int8_t *, u_int));
-void comkbd_raw __P((struct comkbd_softc *, u_int8_t));
-void comkbd_init __P((struct comkbd_softc *));
-void comkbd_putc __P((struct comkbd_softc *, u_int8_t));
-int comkbd_intr __P((void *));
-void comkbd_soft __P((void *));
-void comkbd_bellstop __P((void *));
-void comkbd_bell __P((struct comkbd_softc *, u_int, u_int, u_int));
+void comkbd_enqueue(struct comkbd_softc *, u_int8_t *, u_int);
+void comkbd_raw(struct comkbd_softc *, u_int8_t);
+void comkbd_init(struct comkbd_softc *);
+void comkbd_putc(struct comkbd_softc *, u_int8_t);
+int comkbd_intr(void *);
+void comkbd_soft(void *);
+void comkbd_bellstop(void *);
+void comkbd_bell(struct comkbd_softc *, u_int, u_int, u_int);
 
 struct cfattach comkbd_ca = {
 	sizeof(struct comkbd_softc), comkbd_match, comkbd_attach
diff --git a/sys/arch/sparc64/dev/cons.h b/sys/arch/sparc64/dev/cons.h
index 6dd5fd15136..0234189e786 100644
--- a/sys/arch/sparc64/dev/cons.h
+++ b/sys/arch/sparc64/dev/cons.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.h,v 1.1 2001/08/19 05:21:37 jason Exp $	*/
+/*	$OpenBSD: cons.h,v 1.2 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: cons.h,v 1.3 2000/05/19 05:26:17 eeh Exp $	*/
 
 /*-
@@ -48,22 +48,22 @@ struct pconssoftc {
 
 /* These are shared with the consinit OBP console */
 extern int stdin, stdout;
-void pcons_cnpollc __P((dev_t dev, int on));
+void pcons_cnpollc(dev_t dev, int on);
 
 struct consdev;
 struct zs_chanstate;
 
 extern void *zs_conschan;
 
-extern void nullcnprobe __P((struct consdev *));
+extern void nullcnprobe(struct consdev *);
 
-extern int  zs_getc __P((void *arg));
-extern void zs_putc __P((void *arg, int c));
+extern int  zs_getc(void *arg);
+extern void zs_putc(void *arg, int c);
 
 struct zschan *
-zs_get_chan_addr __P((int zsc_unit, int channel));
+zs_get_chan_addr(int zsc_unit, int channel);
 
 #ifdef	KGDB
-void zs_kgdb_init __P((void));
-void zskgdb __P((struct zs_chanstate *));
+void zs_kgdb_init(void);
+void zskgdb(struct zs_chanstate *);
 #endif
diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c
index f84fa609ff5..df1dbac2f52 100644
--- a/sys/arch/sparc64/dev/consinit.c
+++ b/sys/arch/sparc64/dev/consinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: consinit.c,v 1.6 2002/01/25 03:36:25 jason Exp $	*/
+/*	$OpenBSD: consinit.c,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: consinit.c,v 1.9 2000/10/20 05:32:35 mrg Exp $	*/
 
 /*-
@@ -60,12 +60,12 @@
 
 #include <dev/usb/ukbdvar.h>
 
-static void prom_cnprobe __P((struct consdev *));
-static void prom_cninit __P((struct consdev *));
-int  prom_cngetc __P((dev_t));
-static void prom_cnputc __P((dev_t, int));
-static void prom_cnpollc __P((dev_t, int));
-static void prom_cnputc __P((dev_t, int));
+static void prom_cnprobe(struct consdev *);
+static void prom_cninit(struct consdev *);
+int  prom_cngetc(dev_t);
+static void prom_cnputc(dev_t, int);
+static void prom_cnpollc(dev_t, int);
+static void prom_cnputc(dev_t, int);
 
 int stdin = NULL, stdout = NULL;
 
diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c
index 76e01f7816c..af8635e6bb7 100644
--- a/sys/arch/sparc64/dev/ebus.c
+++ b/sys/arch/sparc64/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ebus.c,v 1.7 2002/02/05 18:34:39 jason Exp $	*/
+/*	$OpenBSD: ebus.c,v 1.8 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $	*/
 
 /*
@@ -77,8 +77,8 @@ int ebus_debug = 0x0;
 #include <sparc64/dev/ebusvar.h>
 #include <sparc64/sparc64/cache.h>
 
-int	ebus_match __P((struct device *, void *, void *));
-void	ebus_attach __P((struct device *, struct device *, void *));
+int	ebus_match(struct device *, void *, void *);
+void	ebus_attach(struct device *, struct device *, void *);
 
 struct cfattach ebus_ca = {
 	sizeof(struct ebus_softc), ebus_match, ebus_attach
@@ -89,34 +89,34 @@ struct cfdriver ebus_cd = {
 };
 
 
-int	ebus_setup_attach_args __P((struct ebus_softc *, int,
-	    struct ebus_attach_args *));
-void	ebus_destroy_attach_args __P((struct ebus_attach_args *));
-int	ebus_print __P((void *, const char *));
-void	ebus_find_ino __P((struct ebus_softc *, struct ebus_attach_args *));
-int	ebus_find_node __P((struct pci_attach_args *));
+int	ebus_setup_attach_args(struct ebus_softc *, int,
+	    struct ebus_attach_args *);
+void	ebus_destroy_attach_args(struct ebus_attach_args *);
+int	ebus_print(void *, const char *);
+void	ebus_find_ino(struct ebus_softc *, struct ebus_attach_args *);
+int	ebus_find_node(struct pci_attach_args *);
 
 /*
  * here are our bus space and bus dma routines.
  */
-static paddr_t ebus_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int));
-static int _ebus_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
+static paddr_t ebus_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
+static int _ebus_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t,
 				bus_size_t, int, vaddr_t,
-				bus_space_handle_t *));
+				bus_space_handle_t *);
 static void *ebus_intr_establish __P((bus_space_tag_t, int, int, int,
-				int (*) __P((void *)), void *));
-
-static int ebus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-			  bus_size_t, struct proc *, int));
-static void ebus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-static void ebus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-				  bus_size_t, int));
-int ebus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
-			   bus_dma_segment_t *, int, int *, int));
-void ebus_dmamem_free __P((bus_dma_tag_t, bus_dma_segment_t *, int));
-int ebus_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, int, size_t,
-			 caddr_t *, int));
-void ebus_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t));
+				int (*)(void *), void *));
+
+static int ebus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+			  bus_size_t, struct proc *, int);
+static void ebus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+static void ebus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+				  bus_size_t, int);
+int ebus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
+			   bus_dma_segment_t *, int, int *, int);
+void ebus_dmamem_free(bus_dma_tag_t, bus_dma_segment_t *, int);
+int ebus_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, int, size_t,
+			 caddr_t *, int);
+void ebus_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t);
 
 int
 ebus_match(parent, match, aux)
@@ -537,7 +537,7 @@ ebus_intr_establish(t, pri, level, flags, handler, arg)
 	int pri;
 	int level;
 	int flags;
-	int (*handler) __P((void *));
+	int (*handler)(void *);
 	void *arg;
 {
 	return (bus_intr_establish(t->parent, pri, level, flags,
diff --git a/sys/arch/sparc64/dev/ebusvar.h b/sys/arch/sparc64/dev/ebusvar.h
index c5008189ef1..a2203c69dd9 100644
--- a/sys/arch/sparc64/dev/ebusvar.h
+++ b/sys/arch/sparc64/dev/ebusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ebusvar.h,v 1.3 2001/10/07 15:27:12 jason Exp $	*/
+/*	$OpenBSD: ebusvar.h,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: ebusvar.h,v 1.5 2001/07/20 00:07:13 eeh Exp $	*/
 
 /*
@@ -71,8 +71,8 @@ struct ebus_softc {
 	int				sc_nintmap;
 };
 
-bus_dma_tag_t ebus_alloc_dma_tag __P((struct ebus_softc *, bus_dma_tag_t));
-bus_space_tag_t ebus_alloc_bus_tag __P((struct ebus_softc *, int));
+bus_dma_tag_t ebus_alloc_dma_tag(struct ebus_softc *, bus_dma_tag_t);
+bus_space_tag_t ebus_alloc_bus_tag(struct ebus_softc *, int);
 
 #define ebus_bus_map(t, bt, a, s, f, v, hp) \
 	bus_space_map2(t, bt, a, s, f, v, hp)
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 97366a664b0..f8fd2cb801e 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.14 2002/03/12 19:41:05 jason Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.15 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $	*/
 
 /*
@@ -82,8 +82,8 @@ int iommu_dvmamap_sync_seg(bus_dma_tag_t, struct iommu_state *,
 			0, (v));				\
 	} while (0)
 
-static	int iommu_strbuf_flush_done __P((struct iommu_state *));
-int64_t iommu_tsb_entry __P((struct iommu_state *, vaddr_t));
+static	int iommu_strbuf_flush_done(struct iommu_state *);
+int64_t iommu_tsb_entry(struct iommu_state *, vaddr_t);
 static	int iommu_tv_comp(struct timeval *, struct timeval *);
 
 /*
diff --git a/sys/arch/sparc64/dev/iommuvar.h b/sys/arch/sparc64/dev/iommuvar.h
index 8a0fee9e08c..22933f7dccf 100644
--- a/sys/arch/sparc64/dev/iommuvar.h
+++ b/sys/arch/sparc64/dev/iommuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommuvar.h,v 1.5 2002/02/22 16:11:59 jason Exp $	*/
+/*	$OpenBSD: iommuvar.h,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: iommuvar.h,v 1.9 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -55,28 +55,28 @@ struct iommu_state {
 };
 
 /* interfaces for PCI/SBUS code */
-void	iommu_init __P((char *, struct iommu_state *, int, u_int32_t));
-void	iommu_reset __P((struct iommu_state *));
-void    iommu_enter __P((struct iommu_state *, vaddr_t, int64_t, int));
-void    iommu_remove __P((struct iommu_state *, vaddr_t, size_t));
-paddr_t iommu_extract __P((struct iommu_state *, vaddr_t));
+void	iommu_init(char *, struct iommu_state *, int, u_int32_t);
+void	iommu_reset(struct iommu_state *);
+void    iommu_enter(struct iommu_state *, vaddr_t, int64_t, int);
+void    iommu_remove(struct iommu_state *, vaddr_t, size_t);
+paddr_t iommu_extract(struct iommu_state *, vaddr_t);
 
-int	iommu_dvmamap_load __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dmamap_t, void *, bus_size_t, struct proc *, int));
-void	iommu_dvmamap_unload __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dmamap_t));
-int	iommu_dvmamap_load_raw __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dmamap_t, bus_dma_segment_t *, int, int, bus_size_t));
-void	iommu_dvmamap_sync __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dmamap_t, bus_addr_t, bus_size_t, int));
-int	iommu_dvmamem_alloc __P((bus_dma_tag_t, struct iommu_state *,
+int	iommu_dvmamap_load(bus_dma_tag_t, struct iommu_state *,
+	    bus_dmamap_t, void *, bus_size_t, struct proc *, int);
+void	iommu_dvmamap_unload(bus_dma_tag_t, struct iommu_state *,
+	    bus_dmamap_t);
+int	iommu_dvmamap_load_raw(bus_dma_tag_t, struct iommu_state *,
+	    bus_dmamap_t, bus_dma_segment_t *, int, int, bus_size_t);
+void	iommu_dvmamap_sync(bus_dma_tag_t, struct iommu_state *,
+	    bus_dmamap_t, bus_addr_t, bus_size_t, int);
+int	iommu_dvmamem_alloc(bus_dma_tag_t, struct iommu_state *,
 	    bus_size_t, bus_size_t, bus_size_t, bus_dma_segment_t *,
-	    int, int *, int));
-void	iommu_dvmamem_free __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dma_segment_t *, int));
-int	iommu_dvmamem_map __P((bus_dma_tag_t, struct iommu_state *,
-	    bus_dma_segment_t *, int, size_t, caddr_t *, int));
-void	iommu_dvmamem_unmap __P((bus_dma_tag_t, struct iommu_state *,
-	    caddr_t, size_t));
+	    int, int *, int);
+void	iommu_dvmamem_free(bus_dma_tag_t, struct iommu_state *,
+	    bus_dma_segment_t *, int);
+int	iommu_dvmamem_map(bus_dma_tag_t, struct iommu_state *,
+	    bus_dma_segment_t *, int, size_t, caddr_t *, int);
+void	iommu_dvmamem_unmap(bus_dma_tag_t, struct iommu_state *,
+	    caddr_t, size_t);
 
 #endif /* _SPARC64_DEV_IOMMUVAR_H_ */
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index e7883a956d0..c18c02c5e3f 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.6 2001/10/12 14:57:04 jason Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $	*/
 
 /*
@@ -469,7 +469,7 @@ pci_intr_establish(pc, ih, level, func, arg, what)
 	pci_chipset_tag_t pc;
 	pci_intr_handle_t ih;
 	int level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 	char *what;
 {
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index 5f560c77779..0a808fe4f06 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcons.c,v 1.3 2001/12/08 17:11:55 miod Exp $	*/
+/*	$OpenBSD: pcons.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $	*/
 
 /*-
@@ -76,10 +76,10 @@ typedef struct cnm_state {
 #define cn_trap()
 #endif
 #define cn_isconsole(d)	((d) == cn_tab->cn_dev)
-void cn_init_magic __P((cnm_state_t *cnm));
-void cn_destroy_magic __P((cnm_state_t *cnm));
-int cn_set_magic __P((char *magic));
-int cn_get_magic __P((char *magic, int len));
+void cn_init_magic(cnm_state_t *cnm);
+void cn_destroy_magic(cnm_state_t *cnm);
+int cn_set_magic(char *magic);
+int cn_get_magic(char *magic, int len);
 /* This should be called for each byte read */
 #ifndef cn_check_magic
 #define cn_check_magic(d, k, s)                                         \
@@ -106,8 +106,8 @@ int cn_get_magic __P((char *magic, int len));
 
 #include <sparc64/dev/cons.h>
 
-static int pconsmatch __P((struct device *, void *, void *));
-static void pconsattach __P((struct device *, struct device *, void *));
+static int pconsmatch(struct device *, void *, void *);
+static void pconsattach(struct device *, struct device *, void *);
 
 struct cfattach pcons_ca = {
 	sizeof(struct pconssoftc), pconsmatch, pconsattach
@@ -120,7 +120,7 @@ struct cfdriver pcons_cd = {
 extern struct cfdriver pcons_cd;
 static struct cnm_state pcons_cnm_state;
 
-static int pconsprobe __P((void));
+static int pconsprobe(void);
 extern struct consdev *cn_tab;
 
 static int
@@ -130,7 +130,7 @@ pconsmatch(parent, match, aux)
 	void *aux;
 {
 	struct mainbus_attach_args *ma = aux;
-	extern int  prom_cngetc __P((dev_t));
+	extern int  prom_cngetc(dev_t);
 
 	/* Only attach if no other console has attached. */
 	return ((strcmp("pcons", ma->ma_name) == 0) &&
@@ -138,7 +138,7 @@ pconsmatch(parent, match, aux)
 
 }
 
-static void pcons_poll __P((void *));
+static void pcons_poll(void *);
 
 static void
 pconsattach(parent, self, aux)
@@ -156,8 +156,8 @@ pconsattach(parent, self, aux)
 	timeout_set(&sc->sc_poll_to, pcons_poll, sc);
 }
 
-static void pconsstart __P((struct tty *));
-static int pconsparam __P((struct tty *, struct termios *));
+static void pconsstart(struct tty *);
+static int pconsparam(struct tty *, struct termios *);
 
 int
 pconsopen(dev, flag, mode, p)
@@ -373,7 +373,7 @@ pcons_cnpollc(dev, on)
 	}
 }
 
-void pcons_dopoll __P((void));
+void pcons_dopoll(void);
 void
 pcons_dopoll() {
 		pcons_poll((void*)pcons_cd.cd_devs[0]);
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index e5f53ca081d..cebe0169b01 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.14 2002/02/05 18:34:39 jason Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.15 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -70,48 +70,48 @@ int psycho_debug = 0x0;
 #define DPRINTF(l, s)
 #endif
 
-static pci_chipset_tag_t psycho_alloc_chipset __P((struct psycho_pbm *, int,
-    pci_chipset_tag_t));
-void psycho_get_bus_range __P((int, int *));
-void psycho_get_ranges __P((int, struct psycho_ranges **, int *));
-void psycho_set_intr __P((struct psycho_softc *, int, void *, 
-    u_int64_t *, u_int64_t *));
+static pci_chipset_tag_t psycho_alloc_chipset(struct psycho_pbm *, int,
+    pci_chipset_tag_t);
+void psycho_get_bus_range(int, int *);
+void psycho_get_ranges(int, struct psycho_ranges **, int *);
+void psycho_set_intr(struct psycho_softc *, int, void *, 
+    u_int64_t *, u_int64_t *);
 
 /* Interrupt handlers */
-int psycho_ue __P((void *));
-int psycho_ce __P((void *));
-int psycho_bus_a __P((void *));
-int psycho_bus_b __P((void *));
-int psycho_bus_error __P((struct psycho_softc *, int));
-int psycho_powerfail __P((void *));
-int psycho_wakeup __P((void *));
+int psycho_ue(void *);
+int psycho_ce(void *);
+int psycho_bus_a(void *);
+int psycho_bus_b(void *);
+int psycho_bus_error(struct psycho_softc *, int);
+int psycho_powerfail(void *);
+int psycho_wakeup(void *);
 
 /* IOMMU support */
-void psycho_iommu_init __P((struct psycho_softc *, int));
+void psycho_iommu_init(struct psycho_softc *, int);
 
 /*
  * bus space and bus dma support for UltraSPARC `psycho'.  note that most
  * of the bus dma support is provided by the iommu dvma controller.
  */
-paddr_t psycho_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int));
-int _psycho_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-    bus_size_t, int, vaddr_t, bus_space_handle_t *));
+paddr_t psycho_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
+int _psycho_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t,
+    bus_size_t, int, vaddr_t, bus_space_handle_t *);
 void *psycho_intr_establish __P((bus_space_tag_t, int, int, int,
-    int (*) __P((void *)), void *));
-
-int psycho_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-    bus_size_t, struct proc *, int));
-void psycho_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-int psycho_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-    bus_dma_segment_t *, int, bus_size_t, int));
-void psycho_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-    bus_size_t, int));
-int psycho_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
-    bus_dma_segment_t *, int, int *, int));
-void psycho_dmamem_free __P((bus_dma_tag_t, bus_dma_segment_t *, int));
-int psycho_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, int, size_t,
-    caddr_t *, int));
-void psycho_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t));
+    int (*)(void *), void *));
+
+int psycho_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+    bus_size_t, struct proc *, int);
+void psycho_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+int psycho_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+    bus_dma_segment_t *, int, bus_size_t, int);
+void psycho_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+    bus_size_t, int);
+int psycho_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
+    bus_dma_segment_t *, int, int *, int);
+void psycho_dmamem_free(bus_dma_tag_t, bus_dma_segment_t *, int);
+int psycho_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, int, size_t,
+    caddr_t *, int);
+void psycho_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t);
 
 /* base pci_chipset */
 extern struct sparc_pci_chipset _sparc_pci_chipset;
@@ -119,10 +119,10 @@ extern struct sparc_pci_chipset _sparc_pci_chipset;
 /*
  * autoconfiguration
  */
-int	psycho_match __P((struct device *, void *, void *));
-void	psycho_attach __P((struct device *, struct device *, void *));
-int	psycho_print __P((void *aux, const char *p));
-int	psycho_get_childspace __P((int));
+int	psycho_match(struct device *, void *, void *);
+void	psycho_attach(struct device *, struct device *, void *);
+int	psycho_print(void *aux, const char *p);
+int	psycho_get_childspace(int);
 
 
 struct cfattach psycho_ca = {
@@ -950,7 +950,7 @@ psycho_intr_establish(t, ihandle, level, flags, handler, arg)
 	int ihandle;
 	int level;
 	int flags;
-	int (*handler) __P((void *));
+	int (*handler)(void *);
 	void *arg;
 {
 	struct psycho_pbm *pp = t->cookie;
diff --git a/sys/arch/sparc64/dev/psychovar.h b/sys/arch/sparc64/dev/psychovar.h
index b9af8ec6346..174ab307fea 100644
--- a/sys/arch/sparc64/dev/psychovar.h
+++ b/sys/arch/sparc64/dev/psychovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psychovar.h,v 1.3 2002/01/31 18:27:26 jason Exp $	*/
+/*	$OpenBSD: psychovar.h,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp $	*/
 
 /*
@@ -110,8 +110,8 @@ struct psycho_softc {
 };
 
 /* config space is per-psycho.  mem/io/dma are per-pci bus */
-bus_dma_tag_t psycho_alloc_dma_tag __P((struct psycho_pbm *));
-bus_space_tag_t psycho_alloc_bus_tag __P((struct psycho_pbm *, int));
+bus_dma_tag_t psycho_alloc_dma_tag(struct psycho_pbm *);
+bus_space_tag_t psycho_alloc_bus_tag(struct psycho_pbm *, int);
 
 #define psycho_alloc_config_tag(pp) psycho_alloc_bus_tag((pp), PCI_CONFIG_BUS_SPACE)
 #define psycho_alloc_mem_tag(pp) psycho_alloc_bus_tag((pp), PCI_MEMORY_BUS_SPACE)
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index 0e34e94b176..e476eee5714 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sab.c,v 1.5 2002/01/18 21:15:56 jason Exp $	*/
+/*	$OpenBSD: sab.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -118,42 +118,42 @@ struct sabtty_softc *sabtty_cons_output;
 #define	SAB_WRITE(sc,r,v)	\
     bus_space_write_1((sc)->sc_bt, (sc)->sc_bh, (r), (v))
 
-int sab_match __P((struct device *, void *, void *));
-void sab_attach __P((struct device *, struct device *, void *));
-int sab_print __P((void *, const char *));
-int sab_intr __P((void *));
-void sab_softintr __P((void *));
-void sab_cnputc __P((dev_t, int));
-int sab_cngetc __P((dev_t));
-void sab_cnpollc __P((dev_t, int));
-
-int sabtty_match __P((struct device *, void *, void *));
-void sabtty_attach __P((struct device *, struct device *, void *));
-void sabtty_start __P((struct tty *));
-int sabtty_param __P((struct tty *, struct termios *));
-int sabtty_intr __P((struct sabtty_softc *, int *));
-void sabtty_softintr __P((struct sabtty_softc *));
-int sabtty_mdmctrl __P((struct sabtty_softc *, int, int));
-void sabtty_cec_wait __P((struct sabtty_softc *));
-void sabtty_tec_wait __P((struct sabtty_softc *));
-void sabtty_reset __P((struct sabtty_softc *));
-void sabtty_flush __P((struct sabtty_softc *));
-int sabtty_speed __P((int));
-void sabtty_console_flags __P((struct sabtty_softc *));
-void sabtty_cnpollc __P((struct sabtty_softc *, int));
-void sabtty_shutdown __P((void *));
-int sabttyparam __P((struct sabtty_softc *, struct tty *, struct termios *));
-
-int sabttyopen __P((dev_t, int, int, struct proc *));
-int sabttyclose __P((dev_t, int, int, struct proc *));
-int sabttyread __P((dev_t, struct uio *, int));
-int sabttywrite __P((dev_t, struct uio *, int));
-int sabttyioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int sabttystop __P((struct tty *, int));
-struct tty *sabttytty __P((dev_t));
-void sabtty_cnputc __P((struct sabtty_softc *, int));
-int sabtty_cngetc __P((struct sabtty_softc *));
-void sabtty_abort __P((struct sabtty_softc *));
+int sab_match(struct device *, void *, void *);
+void sab_attach(struct device *, struct device *, void *);
+int sab_print(void *, const char *);
+int sab_intr(void *);
+void sab_softintr(void *);
+void sab_cnputc(dev_t, int);
+int sab_cngetc(dev_t);
+void sab_cnpollc(dev_t, int);
+
+int sabtty_match(struct device *, void *, void *);
+void sabtty_attach(struct device *, struct device *, void *);
+void sabtty_start(struct tty *);
+int sabtty_param(struct tty *, struct termios *);
+int sabtty_intr(struct sabtty_softc *, int *);
+void sabtty_softintr(struct sabtty_softc *);
+int sabtty_mdmctrl(struct sabtty_softc *, int, int);
+void sabtty_cec_wait(struct sabtty_softc *);
+void sabtty_tec_wait(struct sabtty_softc *);
+void sabtty_reset(struct sabtty_softc *);
+void sabtty_flush(struct sabtty_softc *);
+int sabtty_speed(int);
+void sabtty_console_flags(struct sabtty_softc *);
+void sabtty_cnpollc(struct sabtty_softc *, int);
+void sabtty_shutdown(void *);
+int sabttyparam(struct sabtty_softc *, struct tty *, struct termios *);
+
+int sabttyopen(dev_t, int, int, struct proc *);
+int sabttyclose(dev_t, int, int, struct proc *);
+int sabttyread(dev_t, struct uio *, int);
+int sabttywrite(dev_t, struct uio *, int);
+int sabttyioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int sabttystop(struct tty *, int);
+struct tty *sabttytty(dev_t);
+void sabtty_cnputc(struct sabtty_softc *, int);
+int sabtty_cngetc(struct sabtty_softc *);
+void sabtty_abort(struct sabtty_softc *);
 
 struct cfattach sab_ca = {
 	sizeof(struct sab_softc), sab_match, sab_attach
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 14d730b27ea..3f8c463110c 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbus.c,v 1.11 2002/03/12 19:46:25 jason Exp $	*/
+/*	$OpenBSD: sbus.c,v 1.12 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */
 
 /*-
@@ -138,35 +138,35 @@ int sbus_debug = 0;
 #define DPRINTF(l, s)
 #endif
 
-void sbusreset __P((int));
+void sbusreset(int);
 
-static bus_space_tag_t sbus_alloc_bustag __P((struct sbus_softc *));
-static bus_dma_tag_t sbus_alloc_dmatag __P((struct sbus_softc *));
-static int sbus_get_intr __P((struct sbus_softc *, int,
-			      struct sbus_intr **, int *, int));
-int sbus_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-			      int, bus_space_handle_t *));
-static int sbus_overtemp __P((void *));
-static int _sbus_bus_map __P((
+static bus_space_tag_t sbus_alloc_bustag(struct sbus_softc *);
+static bus_dma_tag_t sbus_alloc_dmatag(struct sbus_softc *);
+static int sbus_get_intr(struct sbus_softc *, int,
+			      struct sbus_intr **, int *, int);
+int sbus_bus_mmap(bus_space_tag_t, bus_type_t, bus_addr_t,
+			      int, bus_space_handle_t *);
+static int sbus_overtemp(void *);
+static int _sbus_bus_map(
 		bus_space_tag_t,
 		bus_type_t,
 		bus_addr_t,		/*offset*/
 		bus_size_t,		/*size*/
 		int,			/*flags*/
 		vaddr_t,		/*preferred virtual address */
-		bus_space_handle_t *));
+		bus_space_handle_t *);
 static void *sbus_intr_establish __P((
 		bus_space_tag_t,
 		int,			/*Sbus interrupt level*/
 		int,			/*`device class' priority*/
 		int,			/*flags*/
-		int (*) __P((void *)),	/*handler*/
+		int (*)(void *),	/*handler*/
 		void *));		/*handler arg*/
 
 
 /* autoconfiguration driver */
-int	sbus_match __P((struct device *, void *, void *));
-void	sbus_attach __P((struct device *, struct device *, void *));
+int	sbus_match(struct device *, void *, void *);
+void	sbus_attach(struct device *, struct device *, void *);
 
 
 struct cfattach sbus_ca = {
@@ -182,23 +182,23 @@ extern struct cfdriver sbus_cd;
 /*
  * DVMA routines
  */
-int sbus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-			  bus_size_t, struct proc *, int));
-void sbus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-int sbus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_dma_segment_t *, int, bus_size_t, int));
-void sbus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-			   bus_size_t, int));
-int sbus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int sbus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+			  bus_size_t, struct proc *, int);
+void sbus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+int sbus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+		    bus_dma_segment_t *, int, bus_size_t, int);
+void sbus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+			   bus_size_t, int);
+int sbus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
 			   bus_size_t alignment, bus_size_t boundary,
 			   bus_dma_segment_t *segs, int nsegs, int *rsegs,
-			   int flags));
-void sbus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-			   int nsegs));
-int sbus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-			 int nsegs, size_t size, caddr_t *kvap, int flags));
-void sbus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
-			    size_t size));
+			   int flags);
+void sbus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+			   int nsegs);
+int sbus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+			 int nsegs, size_t size, caddr_t *kvap, int flags);
+void sbus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
+			    size_t size);
 
 /*
  * Child devices receive the Sbus interrupt level in their attach
@@ -701,7 +701,7 @@ sbus_intr_establish(t, pri, level, flags, handler, arg)
 	int pri;
 	int level;
 	int flags;
-	int (*handler) __P((void *));
+	int (*handler)(void *);
 	void *arg;
 {
 	struct sbus_softc *sc = t->cookie;
diff --git a/sys/arch/sparc64/dev/sbusvar.h b/sys/arch/sparc64/dev/sbusvar.h
index f00e6b1d03a..1794644d80e 100644
--- a/sys/arch/sparc64/dev/sbusvar.h
+++ b/sys/arch/sparc64/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbusvar.h,v 1.3 2002/01/04 05:19:26 jason Exp $	*/
+/*	$OpenBSD: sbusvar.h,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: sbusvar.h,v 1.7 1999/06/05 05:30:43 mrg Exp $ */
 
 /*-
@@ -115,6 +115,6 @@ struct sbus_softc {
 	struct iommu_state	sc_is;		/* IOMMU state, see iommureg.h */
 };
 
-bus_addr_t sbus_bus_addr __P((bus_space_tag_t, u_int, u_int));
+bus_addr_t sbus_bus_addr(bus_space_tag_t, u_int, u_int);
 
 #endif /* _SBUS_VAR_SPARC64_H_ */
diff --git a/sys/arch/sparc64/dev/upavar.h b/sys/arch/sparc64/dev/upavar.h
index 054cc2a2de7..697c57b48b8 100644
--- a/sys/arch/sparc64/dev/upavar.h
+++ b/sys/arch/sparc64/dev/upavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upavar.h,v 1.2 2001/08/18 21:30:00 jason Exp $	*/
+/*	$OpenBSD: upavar.h,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: upavar.h,v 1.2 2000/01/14 14:33:31 pk Exp $ */
 
 /*-
@@ -96,7 +96,7 @@ struct upa_reg {
 struct upadev {
 	struct	device *ud_dev;		/* backpointer to generic */
 	struct	upadev *ud_bchain;	/* forward link in bus chain */
-	void	(*ud_reset) __P((struct device *));
+	void	(*ud_reset)(struct device *);
 };
 
 /* variables per Upa */
@@ -126,19 +126,19 @@ struct upa_attach_args {
 };
 
 /* upa_attach() is also used from obio.c */
-void	upa_attach __P((struct upa_softc *, char *, int,
-			 const char * const *));
-int	upa_print __P((void *, const char *));
+void	upa_attach(struct upa_softc *, char *, int,
+			 const char * const *);
+int	upa_print(void *, const char *);
 
-int	upadev_match __P((struct cfdata *, void *));
-void	upa_establish __P((struct upadev *, struct device *));
+int	upadev_match(struct cfdata *, void *);
+void	upa_establish(struct upadev *, struct device *);
 
-int	upa_setup_attach_args __P((
+int	upa_setup_attach_args(
 		struct upa_softc *,
 		bus_space_tag_t,
 		bus_dma_tag_t,
 		int,			/*node*/
-		struct upa_attach_args *));
+		struct upa_attach_args *);
 
 #define upa_bus_map(t, bt, a, s, f, v, hp) \
 	bus_space_map2(t, bt, a, s, f, v, hp)
diff --git a/sys/arch/sparc64/dev/uperf.c b/sys/arch/sparc64/dev/uperf.c
index fcb24f4f737..71a2944cc5e 100644
--- a/sys/arch/sparc64/dev/uperf.c
+++ b/sys/arch/sparc64/dev/uperf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf.c,v 1.2 2002/01/31 18:35:19 jason Exp $	*/
+/*	$OpenBSD: uperf.c,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -50,10 +50,10 @@ struct cfdriver uperf_cd = {
 	NULL, "uperf", DV_DULL
 };
 
-int uperf_getcntsrc __P((struct uperf_softc *, struct uperf_io *));
-int uperf_findbyval __P((struct uperf_softc *, int, u_int, int *));
-int uperf_findbysrc __P((struct uperf_softc *, int, int, u_int32_t *));
-int uperf_setcntsrc __P((struct uperf_softc *, struct uperf_io *));
+int uperf_getcntsrc(struct uperf_softc *, struct uperf_io *);
+int uperf_findbyval(struct uperf_softc *, int, u_int, int *);
+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)
diff --git a/sys/arch/sparc64/dev/uperf_psycho.c b/sys/arch/sparc64/dev/uperf_psycho.c
index c815d0a5938..5bfc8a5aa84 100644
--- a/sys/arch/sparc64/dev/uperf_psycho.c
+++ b/sys/arch/sparc64/dev/uperf_psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf_psycho.c,v 1.3 2002/01/31 18:35:19 jason Exp $	*/
+/*	$OpenBSD: uperf_psycho.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -51,8 +51,8 @@
 #include <arch/sparc64/dev/psychovar.h>
 #include <arch/sparc64/dev/uperfvar.h>
 
-int uperf_psycho_match __P((struct device *, void *, void *));
-void uperf_psycho_attach __P((struct device *, struct device *, void *));
+int uperf_psycho_match(struct device *, void *, void *);
+void uperf_psycho_attach(struct device *, struct device *, void *);
 
 struct uperf_psycho_softc {
 	struct uperf_softc	sc_usc;
@@ -63,10 +63,10 @@ struct cfattach uperf_psycho_ca = {
 	sizeof(struct uperf_psycho_softc), uperf_psycho_match, uperf_psycho_attach
 };
 
-int uperf_psycho_getcnt __P((void *, int, u_int32_t *, u_int32_t *));
-int uperf_psycho_clrcnt __P((void *, int));
-int uperf_psycho_getcntsrc __P((void *, int, u_int *, u_int *));
-int uperf_psycho_setcntsrc __P((void *, int, u_int, u_int));
+int uperf_psycho_getcnt(void *, int, u_int32_t *, u_int32_t *);
+int uperf_psycho_clrcnt(void *, int);
+int uperf_psycho_getcntsrc(void *, int, u_int *, u_int *);
+int uperf_psycho_setcntsrc(void *, int, u_int, u_int);
 
 struct uperf_src uperf_psycho_srcs[] = {
 	{ UPERFSRC_SDVRA, UPERF_CNT0|UPERF_CNT1, PSY_PMCRSEL_SDVRA },
diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c
index fed90afb065..3a6e84321b0 100644
--- a/sys/arch/sparc64/dev/vgafb.c
+++ b/sys/arch/sparc64/dev/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.5 2002/02/08 16:46:26 jason Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -98,20 +98,20 @@ struct wsscreen_list vgafb_screenlist = {
 	sizeof(vgafb_scrlist) / sizeof(struct wsscreen_descr *), vgafb_scrlist
 };
 
-int vgafb_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-int vgafb_alloc_screen __P((void *, const struct wsscreen_descr *, void **,
-    int *, int *, long *));
-void vgafb_free_screen __P((void *, void *));
+int vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int vgafb_alloc_screen(void *, const struct wsscreen_descr *, void **,
+    int *, int *, long *);
+void vgafb_free_screen(void *, void *);
 int vgafb_show_screen __P((void *, void *, int,
-    void (*cb) __P((void *, int, int)), void *));
-paddr_t vgafb_mmap __P((void *, off_t, int));
-int vgafb_is_console __P((int));
-int vgafb_getcmap __P((struct vgafb_softc *, struct wsdisplay_cmap *));
-int vgafb_putcmap __P((struct vgafb_softc *, struct wsdisplay_cmap *));
-void vgafb_setcolor __P((struct vgafb_softc *, unsigned int,
-    u_int8_t, u_int8_t, u_int8_t));
+    void (*cb)(void *, int, int), void *));
+paddr_t vgafb_mmap(void *, off_t, int);
+int vgafb_is_console(int);
+int vgafb_getcmap(struct vgafb_softc *, struct wsdisplay_cmap *);
+int vgafb_putcmap(struct vgafb_softc *, struct wsdisplay_cmap *);
+void vgafb_setcolor(struct vgafb_softc *, unsigned int,
+    u_int8_t, u_int8_t, u_int8_t);
 
-static int a2int __P((char *, int));
+static int a2int(char *, int);
 
 struct wsdisplay_accessops vgafb_accessops = {
 	vgafb_ioctl,
@@ -122,8 +122,8 @@ struct wsdisplay_accessops vgafb_accessops = {
 	0 /* load_font */
 };
 
-int	vgafbmatch	__P((struct device *, void *, void *));
-void	vgafbattach	__P((struct device *, struct device *, void *));
+int	vgafbmatch(struct device *, void *, void *);
+void	vgafbattach(struct device *, struct device *, void *);
 
 struct cfattach vgafb_ca = {
 	sizeof (struct vgafb_softc), vgafbmatch, vgafbattach
@@ -402,7 +402,7 @@ vgafb_show_screen(v, cookie, waitok, cb, cbarg)
 	void *v;
 	void *cookie;
 	int waitok;
-	void (*cb) __P((void *, int, int));
+	void (*cb)(void *, int, int);
 	void *cbarg;
 {
 	return (0);
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index 9c5fbb51deb..412500ff1e5 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.9 2002/03/05 20:10:51 jason Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.10 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -217,35 +217,35 @@ struct cfattach zskbd_ca = {
 
 struct zsops zsops_kbd;
 
-static void zs_modem __P((struct zskbd_softc *, int));
-static void  zs_hwiflow __P((struct zskbd_softc *));
-static void zs_maskintr __P((struct zskbd_softc *));
+static void zs_modem(struct zskbd_softc *, int);
+static void  zs_hwiflow(struct zskbd_softc *);
+static void zs_maskintr(struct zskbd_softc *);
 
-struct zskbd_softc *zskbd_device_lookup __P((struct cfdriver *, int));
+struct zskbd_softc *zskbd_device_lookup(struct cfdriver *, int);
 
 /* Low-level routines. */
-static void zskbd_rxint   __P((struct zs_chanstate *));
-static void zskbd_stint   __P((struct zs_chanstate *, int));
-static void zskbd_txint   __P((struct zs_chanstate *));
-static void zskbd_softint __P((struct zs_chanstate *));
-static void zskbd_diag __P((void *));
+static void zskbd_rxint(struct zs_chanstate *);
+static void zskbd_stint(struct zs_chanstate *, int);
+static void zskbd_txint(struct zs_chanstate *);
+static void zskbd_softint(struct zs_chanstate *);
+static void zskbd_diag(void *);
 
-void zskbd_init __P((struct zskbd_softc *));
-void zskbd_putc __P((struct zskbd_softc *, u_int8_t));
-void zskbd_raw __P((struct zskbd_softc *, u_int8_t));
+void zskbd_init(struct zskbd_softc *);
+void zskbd_putc(struct zskbd_softc *, u_int8_t);
+void zskbd_raw(struct zskbd_softc *, u_int8_t);
 
 /* wskbd glue */
-int zskbd_enable __P((void *, int));
-void zskbd_set_leds __P((void *, int));
-int zskbd_get_leds __P((struct zskbd_softc *));
-int zskbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-void zskbd_cngetc __P((void *, u_int *, int *));
-void zskbd_cnpollc __P((void *, int));
-
-void zsstart_tx __P((struct zskbd_softc *));
-int zsenqueue_tx __P((struct zskbd_softc *, u_char *, int));
-void zskbd_bell __P((struct zskbd_softc *, u_int, u_int, u_int));
-void zskbd_bellstop __P((void *));
+int zskbd_enable(void *, int);
+void zskbd_set_leds(void *, int);
+int zskbd_get_leds(struct zskbd_softc *);
+int zskbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+void zskbd_cngetc(void *, u_int *, int *);
+void zskbd_cnpollc(void *, int);
+
+void zsstart_tx(struct zskbd_softc *);
+int zsenqueue_tx(struct zskbd_softc *, u_char *, int);
+void zskbd_bell(struct zskbd_softc *, u_int, u_int, u_int);
+void zskbd_bellstop(void *);
 
 struct wskbd_accessops zskbd_accessops = {
 	zskbd_enable,
@@ -764,9 +764,9 @@ zs_hwiflow(zst)
  ****************************************************************/
 
 #define	integrate
-integrate void zskbd_rxsoft __P((struct zskbd_softc *));
-integrate void zskbd_txsoft __P((struct zskbd_softc *));
-integrate void zskbd_stsoft __P((struct zskbd_softc *));
+integrate void zskbd_rxsoft(struct zskbd_softc *);
+integrate void zskbd_txsoft(struct zskbd_softc *);
+integrate void zskbd_stsoft(struct zskbd_softc *);
 /*
  * receiver ready interrupt.
  * called at splzs
diff --git a/sys/arch/sparc64/dev/z8530sc.c b/sys/arch/sparc64/dev/z8530sc.c
index fa631060e13..df0a27bd052 100644
--- a/sys/arch/sparc64/dev/z8530sc.c
+++ b/sys/arch/sparc64/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530sc.c,v 1.1 2001/08/21 21:42:30 jason Exp $	*/
+/*	$OpenBSD: z8530sc.c,v 1.2 2002/03/14 01:26:45 millert Exp $	*/
 /*	$NetBSD: z8530sc.c,v 1.15 2001/07/07 15:53:22 thorpej Exp $	*/
 
 /*
@@ -311,10 +311,10 @@ zsc_intr_soft(arg)
  * Provide a null zs "ops" vector.
  */
 
-static void zsnull_rxint   __P((struct zs_chanstate *));
-static void zsnull_stint   __P((struct zs_chanstate *, int));
-static void zsnull_txint   __P((struct zs_chanstate *));
-static void zsnull_softint __P((struct zs_chanstate *));
+static void zsnull_rxint(struct zs_chanstate *);
+static void zsnull_stint(struct zs_chanstate *, int);
+static void zsnull_txint(struct zs_chanstate *);
+static void zsnull_softint(struct zs_chanstate *);
 
 static void
 zsnull_rxint(cs)
diff --git a/sys/arch/sparc64/dev/z8530sc.h b/sys/arch/sparc64/dev/z8530sc.h
index 73986ba7707..6cde4b1329f 100644
--- a/sys/arch/sparc64/dev/z8530sc.h
+++ b/sys/arch/sparc64/dev/z8530sc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530sc.h,v 1.2 2002/01/15 22:00:12 jason Exp $	*/
+/*	$OpenBSD: z8530sc.h,v 1.3 2002/03/14 01:26:45 millert Exp $	*/
 /*	$NetBSD: z8530sc.h,v 1.15 2001/05/11 01:40:48 thorpej Exp $	*/
 
 /*
@@ -52,13 +52,13 @@
  */
 struct zs_chanstate;
 struct zsops {
-	void	(*zsop_rxint) __P((struct zs_chanstate *));
+	void	(*zsop_rxint)(struct zs_chanstate *);
 					/* receive char available */
-	void	(*zsop_stint) __P((struct zs_chanstate *, int));
+	void	(*zsop_stint)(struct zs_chanstate *, int);
 					/* external/status */
-	void	(*zsop_txint) __P((struct zs_chanstate *));
+	void	(*zsop_txint)(struct zs_chanstate *);
 					/* xmit buffer empty */
-	void	(*zsop_softint) __P((struct zs_chanstate *));
+	void	(*zsop_softint)(struct zs_chanstate *);
 					/* process software interrupt */
 };
 
@@ -116,8 +116,8 @@ struct zs_chanstate {
 	char	cs_spare1;  	/* (for skippy :) */
 
 	/* power management hooks */
-	int	(*enable) __P((struct zs_chanstate *));
-	void	(*disable) __P((struct zs_chanstate *));
+	int	(*enable)(struct zs_chanstate *);
+	void	(*disable)(struct zs_chanstate *);
 	int	enabled;
 
 	/* MD code might define a larger variant of this. */
@@ -142,17 +142,17 @@ struct zsc_attach_args {
 #define ZS_HWFLAG_USE_CONSDEV  	32	/* Use console ops from `consdev' */
 #define	ZS_HWFLAG_NORESET	64	/* Don't reset at attach time */
 
-int 	zsc_intr_soft __P((void *));
-int 	zsc_intr_hard __P((void *));
+int 	zsc_intr_soft(void *);
+int 	zsc_intr_hard(void *);
 
-void	zs_abort __P((struct zs_chanstate *));
-void	zs_break __P((struct zs_chanstate *, int));
-void	zs_iflush __P((struct zs_chanstate *));
-void	zs_loadchannelregs __P((struct zs_chanstate *));
-int 	zs_set_speed __P((struct zs_chanstate *, int));
-int 	zs_set_modes __P((struct zs_chanstate *, int));
+void	zs_abort(struct zs_chanstate *);
+void	zs_break(struct zs_chanstate *, int);
+void	zs_iflush(struct zs_chanstate *);
+void	zs_loadchannelregs(struct zs_chanstate *);
+int 	zs_set_speed(struct zs_chanstate *, int);
+int 	zs_set_modes(struct zs_chanstate *, int);
 
 extern int zs_major;
 
-int zs_check_kgdb __P((struct zs_chanstate *, int));
+int zs_check_kgdb(struct zs_chanstate *, int);
 
diff --git a/sys/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c
index 09976d724aa..be813e80cef 100644
--- a/sys/arch/sparc64/dev/z8530tty.c
+++ b/sys/arch/sparc64/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.3 2002/01/30 20:45:34 nordin Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.4 2002/03/14 01:26:45 millert Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -206,24 +206,24 @@ struct zsops zsops_tty;
 /* Routines called from other code. */
 cdev_decl(zs);	/* open, close, read, write, ioctl, stop, ... */
 
-static void zs_shutdown __P((struct zstty_softc *));
-static void	zsstart __P((struct tty *));
-static int	zsparam __P((struct tty *, struct termios *));
-static void zs_modem __P((struct zstty_softc *, int));
-static void tiocm_to_zs __P((struct zstty_softc *, u_long, int));
-static int  zs_to_tiocm __P((struct zstty_softc *));
-static int    zshwiflow __P((struct tty *, int));
-static void  zs_hwiflow __P((struct zstty_softc *));
-static void zs_maskintr __P((struct zstty_softc *));
+static void zs_shutdown(struct zstty_softc *);
+static void	zsstart(struct tty *);
+static int	zsparam(struct tty *, struct termios *);
+static void zs_modem(struct zstty_softc *, int);
+static void tiocm_to_zs(struct zstty_softc *, u_long, int);
+static int  zs_to_tiocm(struct zstty_softc *);
+static int    zshwiflow(struct tty *, int);
+static void  zs_hwiflow(struct zstty_softc *);
+static void zs_maskintr(struct zstty_softc *);
 
-struct zstty_softc *zs_device_lookup __P((struct cfdriver *, int));
+struct zstty_softc *zs_device_lookup(struct cfdriver *, int);
 
 /* Low-level routines. */
-static void zstty_rxint   __P((struct zs_chanstate *));
-static void zstty_stint   __P((struct zs_chanstate *, int));
-static void zstty_txint   __P((struct zs_chanstate *));
-static void zstty_softint __P((struct zs_chanstate *));
-static void zstty_diag __P((void *));
+static void zstty_rxint(struct zs_chanstate *);
+static void zstty_stint(struct zs_chanstate *, int);
+static void zstty_txint(struct zs_chanstate *);
+static void zstty_softint(struct zs_chanstate *);
+static void zstty_diag(void *);
 
 
 #define	ZSUNIT(x)	(minor(x) & 0x7ffff)
@@ -1205,9 +1205,9 @@ zs_hwiflow(zst)
  ****************************************************************/
 
 #define	integrate	static inline
-integrate void zstty_rxsoft __P((struct zstty_softc *, struct tty *));
-integrate void zstty_txsoft __P((struct zstty_softc *, struct tty *));
-integrate void zstty_stsoft __P((struct zstty_softc *, struct tty *));
+integrate void zstty_rxsoft(struct zstty_softc *, struct tty *);
+integrate void zstty_txsoft(struct zstty_softc *, struct tty *);
+integrate void zstty_stsoft(struct zstty_softc *, struct tty *);
 /*
  * receiver ready interrupt.
  * called at splzs
@@ -1394,7 +1394,7 @@ zstty_rxsoft(zst, tp)
 	struct tty *tp;
 {
 	struct zs_chanstate *cs = zst->zst_cs;
-	int (*rint) __P((int c, struct tty *tp)) = linesw[tp->t_line].l_rint;
+	int (*rint)(int c, struct tty *tp) = linesw[tp->t_line].l_rint;
 	u_char *get, *end;
 	u_int cc, scc;
 	u_char rr1;
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index 74a392aedd1..4a26da86fc6 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.8 2002/01/25 03:58:39 jason Exp $	*/
+/*	$OpenBSD: zs.c,v 1.9 2002/03/14 01:26:45 millert Exp $	*/
 /*	$NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -138,9 +138,9 @@ static u_char zs_init_reg[16] = {
 };
 
 /* Console ops */
-static int  zscngetc __P((dev_t));
-static void zscnputc __P((dev_t, int));
-static void zscnpollc __P((dev_t, int));
+static int  zscngetc(dev_t);
+static void zscnputc(dev_t, int);
+static void zscnpollc(dev_t, int);
 
 struct consdev zs_consdev = {
 	NULL,
@@ -157,11 +157,11 @@ struct consdev zs_consdev = {
  ****************************************************************/
 
 /* Definition of the driver for autoconfig. */
-static int  zs_match_mainbus __P((struct device *, void *, void *));
-static void zs_attach_mainbus __P((struct device *, struct device *, void *));
+static int  zs_match_mainbus(struct device *, void *, void *);
+static void zs_attach_mainbus(struct device *, struct device *, void *);
 
-static void zs_attach __P((struct zsc_softc *, struct zsdevice *, int));
-static int  zs_print __P((void *, const char *name));
+static void zs_attach(struct zsc_softc *, struct zsdevice *, int);
+static int  zs_print(void *, const char *name);
 
 /* Do we really need this ? */
 struct cfattach zs_ca = {
@@ -177,18 +177,18 @@ extern int stdinnode;
 extern int fbnode;
 
 /* Interrupt handlers. */
-int zscheckintr __P((void *));
-static int zshard __P((void *));
-static void zssoft __P((void *));
+int zscheckintr(void *);
+static int zshard(void *);
+static void zssoft(void *);
 
-static int zs_get_speed __P((struct zs_chanstate *));
+static int zs_get_speed(struct zs_chanstate *);
 
 /* Console device support */
-static int zs_console_flags __P((int, int, int));
+static int zs_console_flags(int, int, int);
 
 /* Power management hooks */
-int  zs_enable __P((struct zs_chanstate *));
-void zs_disable __P((struct zs_chanstate *));
+int  zs_enable(struct zs_chanstate *);
+void zs_disable(struct zs_chanstate *);
 
 /*
  * Is the zs chip present?
@@ -657,7 +657,7 @@ void  zs_write_data(cs, val)
  * XXX - I think I like the mvme167 code better. -gwr
  ****************************************************************/
 
-extern void Debugger __P((void));
+extern void Debugger(void);
 
 /*
  * Handle user request to enter kernel debugger.