Final __P removal plus some cosmetic fixups

8 files changed, 26 insertions, 26 deletions

diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index 92146092b3e..e9ac05101ce 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ce4231.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: ce4231.c,v 1.7 2002/03/14 03:16:00 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -157,10 +157,10 @@ 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)(void *), void *arg, struct audio_params *));
-int	ce4231_trigger_input __P((void *, void *, void *, int,
-    void (*intr)(void *), void *arg, struct audio_params *));
+int	ce4231_trigger_output(void *, void *, void *, int,
+    void (*intr)(void *), void *arg, struct audio_params *);
+int	ce4231_trigger_input(void *, void *, void *, int,
+    void (*intr)(void *), void *arg, struct audio_params *);
 
 struct audio_hw_if ce4231_sa_hw_if = {
 	ce4231_open,
diff --git a/sys/arch/sparc64/dev/ce4231var.h b/sys/arch/sparc64/dev/ce4231var.h
index 33fb3387dea..b25ffe70769 100644
--- a/sys/arch/sparc64/dev/ce4231var.h
+++ b/sys/arch/sparc64/dev/ce4231var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ce4231var.h,v 1.3 2002/01/24 03:06:54 jason Exp $	*/
+/*	$OpenBSD: ce4231var.h,v 1.4 2002/03/14 03:16:00 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -66,10 +66,10 @@ struct ce4231_softc {
 	int	sc_open;		/* already open? */
 	int	sc_locked;		/* locked? */
 
-	void	(*sc_rintr)(void*);	/* input completion intr handler */
-	void *	sc_rarg;		/* arg for sc_rintr() */
-	void	(*sc_pintr)(void*);	/* output completion intr handler */
-	void *	sc_parg;		/* arg for sc_pintr() */
+	void	(*sc_rintr)(void *);	/* input completion intr handler */
+	void	*sc_rarg;		/* arg for sc_rintr() */
+	void	(*sc_pintr)(void *);	/* output completion intr handler */
+	void	*sc_parg;		/* arg for sc_pintr() */
 
 	char		sc_mute[9];	/* which devs are muted */
 	u_int8_t	sc_out_port;	/* output port */
diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c
index af8635e6bb7..cc3f022b634 100644
--- a/sys/arch/sparc64/dev/ebus.c
+++ b/sys/arch/sparc64/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ebus.c,v 1.8 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: ebus.c,v 1.9 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $	*/
 
 /*
@@ -103,8 +103,8 @@ 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 *);
-static void *ebus_intr_establish __P((bus_space_tag_t, int, int, int,
-				int (*)(void *), void *));
+static void *ebus_intr_establish(bus_space_tag_t, int, int, int,
+				int (*)(void *), void *);
 
 static int ebus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
 			  bus_size_t, struct proc *, int);
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index 0a808fe4f06..7a7e1020851 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcons.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: pcons.c,v 1.5 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $	*/
 
 /*-
@@ -376,7 +376,7 @@ pcons_cnpollc(dev, on)
 void pcons_dopoll(void);
 void
 pcons_dopoll() {
-		pcons_poll((void*)pcons_cd.cd_devs[0]);
+		pcons_poll((void *)pcons_cd.cd_devs[0]);
 }
 
 /* XXXXXXXX --- more cnmagic stuff. */
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index cebe0169b01..cc6307b70b0 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.15 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.16 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -96,8 +96,8 @@ void psycho_iommu_init(struct psycho_softc *, int);
 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 (*)(void *), void *));
+void *psycho_intr_establish(bus_space_tag_t, int, int, int,
+    int (*)(void *), void *);
 
 int psycho_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
     bus_size_t, struct proc *, int);
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 3f8c463110c..b5da982b638 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbus.c,v 1.12 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: sbus.c,v 1.13 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */
 
 /*-
@@ -155,13 +155,13 @@ static int _sbus_bus_map(
 		int,			/*flags*/
 		vaddr_t,		/*preferred virtual address */
 		bus_space_handle_t *);
-static void *sbus_intr_establish __P((
+static void *sbus_intr_establish(
 		bus_space_tag_t,
 		int,			/*Sbus interrupt level*/
 		int,			/*`device class' priority*/
 		int,			/*flags*/
 		int (*)(void *),	/*handler*/
-		void *));		/*handler arg*/
+		void *);		/*handler arg*/
 
 
 /* autoconfiguration driver */
diff --git a/sys/arch/sparc64/dev/upavar.h b/sys/arch/sparc64/dev/upavar.h
index 697c57b48b8..67c51ce0873 100644
--- a/sys/arch/sparc64/dev/upavar.h
+++ b/sys/arch/sparc64/dev/upavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upavar.h,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: upavar.h,v 1.4 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: upavar.h,v 1.2 2000/01/14 14:33:31 pk Exp $ */
 
 /*-
@@ -118,7 +118,7 @@ struct upa_attach_args {
 	int		ua_node;	/* PROM handle */
 	struct upa_reg	*ua_reg;	/* "reg" properties */
 	int		ua_nreg;
-	void*		*ua_address;	/* "address" properties */
+	void *		*ua_address;	/* "address" properties */
 	int		ua_naddress;
 	int		*ua_interrupts;	/* "interrupts" properties */
 	int		ua_ninterrupts;
diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c
index 3a6e84321b0..cb6130d2c00 100644
--- a/sys/arch/sparc64/dev/vgafb.c
+++ b/sys/arch/sparc64/dev/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.7 2002/03/14 03:16:00 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -102,8 +102,8 @@ 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)(void *, int, int), void *));
+int vgafb_show_screen(void *, void *, int,
+    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 *);