Final __P removal plus some cosmetic fixups

7 files changed, 26 insertions, 28 deletions

diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h
index cdf099f0dfc..079ea8a154a 100644
--- a/sys/arch/sparc64/include/autoconf.h
+++ b/sys/arch/sparc64/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.6 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.7 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */
 
 /*-
@@ -168,8 +168,7 @@ int		sd_crazymap(int);
 struct	device *parsedisk(char *, int, int, dev_t *);
 
 /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */
-void	mountroot_hook_establish __P((void (*)(struct device *),
-				      struct device *));
+void	mountroot_hook_establish(void (*)(struct device *), struct device *);
 
 void	bootstrap(int);
 int	firstchild(int);
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h
index 692c7a43217..3e42fad0917 100644
--- a/sys/arch/sparc64/include/bus.h
+++ b/sys/arch/sparc64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.11 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: bus.h,v 1.12 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $	*/
 
 /*-
@@ -157,9 +157,9 @@ struct sparc_bus_space_tag {
 	paddr_t	(*sparc_bus_mmap)(bus_space_tag_t,
 		bus_addr_t, off_t, int, int);
 
-	void	*(*sparc_intr_establish) __P((bus_space_tag_t,
+	void	*(*sparc_intr_establish)(bus_space_tag_t,
 		int, int, int,
-		int (*)(void *), void *));
+		int (*)(void *), void *);
 
 };
 
@@ -233,14 +233,14 @@ static paddr_t	bus_space_mmap(
 				off_t,			/*offset*/
 				int,			/*prot*/
 				int);			/*flags*/
-static void	*bus_intr_establish __P((
+static void	*bus_intr_establish(
 				bus_space_tag_t,
 				int,			/*bus-specific intr*/
 				int,			/*device class level,
 							  see machine/intr.h*/
 				int,			/*flags*/
 				int (*)(void *),	/*handler*/
-				void *));		/*handler arg*/
+				void *);		/*handler arg*/
 
 
 /* This macro finds the first "upstream" implementation of method `f' */
@@ -383,7 +383,7 @@ void * bus_space_vaddr(bus_space_tag_t space, bus_space_handle_t handle);
  *	the temporary virtual address
  *	the passed `arg' argument
  */
-int bus_space_probe __P((
+int bus_space_probe(
 		bus_space_tag_t,
 		bus_type_t,
 		bus_addr_t,
@@ -391,7 +391,7 @@ int bus_space_probe __P((
 		size_t,				/* offset */
 		int,				/* flags */
 		int (*)(void *, void *),	/* callback function */
-		void *));			/* callback arg */
+		void *);			/* callback arg */
 
 
 /*
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 5f4d634f812..c9df2248502 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.9 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -299,7 +299,7 @@ void	amd7930_trap(void);
 /* cons.c */
 int	cnrom(void);
 /* zs.c */
-void zsconsole __P((struct tty *, int, int, void (**)(struct tty *, int)));
+void zsconsole(struct tty *, int, int, void (**)(struct tty *, int));
 #ifdef KGDB
 void zs_kgdb_init(void);
 #endif
@@ -307,7 +307,7 @@ void zs_kgdb_init(void);
 void	fb_unblank(void);
 /* kgdb_stub.c */
 #ifdef KGDB
-void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *));
+void kgdb_attach(int (*)(void *), void (*)(void *, int), void *);
 void kgdb_connect(int);
 void kgdb_panic(void);
 #endif
diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h
index 4ea39b564b4..70dccdd829c 100644
--- a/sys/arch/sparc64/include/intr.h
+++ b/sys/arch/sparc64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */
 
 /*-
@@ -55,7 +55,7 @@
 #define	IPL_HIGH	PIL_HIGH	/* everything */
 
 void *
-softintr_establish __P((int level, void (*fun)(void *), void *arg));
+softintr_establish(int level, void (*fun)(void *), void *arg);
 
 void
 softintr_disestablish(void *cookie);
diff --git a/sys/arch/sparc64/include/openfirm.h b/sys/arch/sparc64/include/openfirm.h
index 20be67c12c0..7d27aaff1ad 100644
--- a/sys/arch/sparc64/include/openfirm.h
+++ b/sys/arch/sparc64/include/openfirm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.h,v 1.2 2001/08/19 05:15:40 art Exp $	*/
+/*	$OpenBSD: openfirm.h,v 1.3 2002/03/14 03:16:00 millert Exp $	*/
 /*	$NetBSD: openfirm.h,v 1.8 2001/07/20 00:07:14 eeh Exp $	*/
 
 /*
@@ -47,9 +47,9 @@ typedef u_int64_t cell_t;
 #define ADR2CELL(x)	(cell_t)(u_int)(int)(x)
 #endif
 
-int OF_test (char* service);
-int OF_test_method (int handle, char* method);
-int OF_getproplen (int handle, char* prop);
+int OF_test (char *service);
+int OF_test_method (int handle, char *method);
+int OF_getproplen (int handle, char *prop);
 
 int OF_stdin (void);
 int OF_stdout (void);
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 250d5ffe4ea..81681aff364 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -172,8 +172,7 @@ void pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int numctx);
 /* SPARC specific? */
 void		pmap_redzone(void);
 int             pmap_dumpsize(void);
-int             pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t),
-                                 daddr_t));
+int             pmap_dumpmmu(int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t);
 int		pmap_pa_exists(paddr_t);
 struct proc;
 void		switchexit(struct proc *);
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index 392e4d4a738..520087e4af7 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.3 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: psl.h,v 1.4 2002/03/14 03:16:01 millert Exp $	*/
 /*	$NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
 
 /*
@@ -310,8 +310,8 @@ void prom_printf(const char *fmt, ...);
 extern int printspl;
 #define SPLPRINT(x)	if(printspl) { int i=10000000; prom_printf x ; while(i--); }
 #define	SPL(name, newpil) \
-static __inline int name##X(const char*, int); \
-static __inline int name##X(const char* file, int line) \
+static __inline int name##X(const char *, int); \
+static __inline int name##X(const char *file, int line) \
 { \
 	int oldpil; \
 	__asm __volatile("rdpr %%pil,%0" : "=r" (oldpil)); \
@@ -321,8 +321,8 @@ static __inline int name##X(const char* file, int line) \
 }
 /* A non-priority-decreasing version of SPL */
 #define	SPLHOLD(name, newpil) \
-static __inline int name##X(const char*, int); \
-static __inline int name##X(const char* file, int line) \
+static __inline int name##X(const char *, int); \
+static __inline int name##X(const char * file, int line) \
 { \
 	int oldpil; \
 	__asm __volatile("rdpr %%pil,%0" : "=r" (oldpil)); \
@@ -446,10 +446,10 @@ static __inline void splx(newpil)
 #define	splhigh()	splhighX(__FILE__, __LINE__)
 #define splx(x)		splxX((x),__FILE__, __LINE__)
 
-static __inline void splxX(int, const char*, int);
+static __inline void splxX(int, const char *, int);
 static __inline void splxX(newpil, file, line)
 	int newpil, line;
-	const char* file;
+	const char *file;
 #else
 static __inline void splx(newpil)
 	int newpil;