First round of __P removal in sys

14 files changed, 125 insertions, 125 deletions

diff --git a/sys/arch/hp300/stand/cdboot/conf.c b/sys/arch/hp300/stand/cdboot/conf.c
index 8dc30a69698..a9d93545a27 100644
--- a/sys/arch/hp300/stand/cdboot/conf.c
+++ b/sys/arch/hp300/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.1 1999/08/16 09:43:08 downsj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $	*/
 
 /*
@@ -49,15 +49,15 @@ int	debug = 0;	/* XXX */
 /*
  * Device configuration
  */
-int	sdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int	sdopen __P((struct open_file *, ...));
-int	sdclose __P((struct open_file *));
+int	sdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	sdopen(struct open_file *, ...);
+int	sdclose(struct open_file *);
 #define	sdioctl		noioctl
 
 #define xxstrategy	\
-	(int (*) __P((void *, int, daddr_t, size_t, void *, size_t *)))nullsys
-#define xxopen		(int (*) __P((struct open_file *, ...)))nodev
-#define xxclose		(int (*) __P((struct open_file *)))nullsys
+	(int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys
+#define xxopen		(int (*)(struct open_file *, ...))nodev
+#define xxclose		(int (*)(struct open_file *))nullsys
 
 struct devsw devsw[] = {
 	{ "??",	xxstrategy,	xxopen,	xxclose,	noioctl }, /*0*/
@@ -71,7 +71,7 @@ int	ndevs = (sizeof(devsw) / sizeof(devsw[0]));
 /*
  * Physical unit/lun detection.
  */
-int	punitzero __P((int, int, int *));
+int	punitzero(int, int, int *);
 
 int
 punitzero(ctlr, slave, punit)
diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c
index 41ce3e30086..4336a687b8b 100644
--- a/sys/arch/hp300/stand/common/ite.c
+++ b/sys/arch/hp300/stand/common/ite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite.c,v 1.1 1997/07/14 08:14:17 downsj Exp $	*/
+/*	$OpenBSD: ite.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 #include "consdefs.h"
 #include "samachdep.h"
 
-void	ite_deinit_noop __P((struct ite_data *));
+void	ite_deinit_noop(struct ite_data *);
 
 struct itesw itesw[] = {
 	{ GID_TOPCAT,
diff --git a/sys/arch/hp300/stand/common/ite_dv.c b/sys/arch/hp300/stand/common/ite_dv.c
index 60066d37c22..94b7b122aa5 100644
--- a/sys/arch/hp300/stand/common/ite_dv.c
+++ b/sys/arch/hp300/stand/common/ite_dv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite_dv.c,v 1.1 1997/07/14 08:14:18 downsj Exp $	*/
+/*	$OpenBSD: ite_dv.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite_dv.c,v 1.8 1996/03/03 04:23:35 thorpej Exp $	*/
 
 /*
@@ -57,8 +57,8 @@
 #define REGBASE		((struct dvboxfb *)(ip->regbase))
 #define WINDOWMOVER	dvbox_windowmove
 
-void	dvbox_windowmove __P((struct ite_data *, int, int, int, int,
-	    int, int, int));
+void	dvbox_windowmove(struct ite_data *, int, int, int, int,
+	    int, int, int);
 
 void
 dvbox_init(ip)
diff --git a/sys/arch/hp300/stand/common/ite_gb.c b/sys/arch/hp300/stand/common/ite_gb.c
index d94cf3810c8..6e9155187a7 100644
--- a/sys/arch/hp300/stand/common/ite_gb.c
+++ b/sys/arch/hp300/stand/common/ite_gb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite_gb.c,v 1.1 1997/07/14 08:14:19 downsj Exp $	*/
+/*	$OpenBSD: ite_gb.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite_gb.c,v 1.8 1996/03/03 04:23:36 thorpej Exp $	*/
 
 /*
@@ -57,8 +57,8 @@
 #define REGBASE     	((struct gboxfb *)(ip->regbase))
 #define WINDOWMOVER 	gbox_windowmove
 
-void	gbox_windowmove __P((struct ite_data *, int, int, int, int,
-	    int, int, int));
+void	gbox_windowmove(struct ite_data *, int, int, int, int,
+	    int, int, int);
 
 void
 gbox_init(ip)
diff --git a/sys/arch/hp300/stand/common/ite_hy.c b/sys/arch/hp300/stand/common/ite_hy.c
index 1aebd1b2c43..b2567975d1b 100644
--- a/sys/arch/hp300/stand/common/ite_hy.c
+++ b/sys/arch/hp300/stand/common/ite_hy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite_hy.c,v 1.1 1997/07/14 08:14:20 downsj Exp $	*/
+/*	$OpenBSD: ite_hy.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite_hy.c,v 1.3 1996/03/03 04:23:37 thorpej Exp $	*/
 
 /*
@@ -61,9 +61,9 @@
 #define	charX(ip,c)	\
 	(((c) % (ip)->cpl) * ((((ip)->ftwidth + 7) / 8) * 8) + (ip)->fontx)
 
-void	hyper_ite_fontinit __P((struct ite_data *));
-void	hyper_windowmove __P((struct ite_data *, int, int, int, int,
-	    int, int, int));
+void	hyper_ite_fontinit(struct ite_data *);
+void	hyper_windowmove(struct ite_data *, int, int, int, int,
+	    int, int, int);
 
 void
 hyper_init(ip)
diff --git a/sys/arch/hp300/stand/common/ite_rb.c b/sys/arch/hp300/stand/common/ite_rb.c
index a8c1f7375d4..ac44237c144 100644
--- a/sys/arch/hp300/stand/common/ite_rb.c
+++ b/sys/arch/hp300/stand/common/ite_rb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite_rb.c,v 1.1 1997/07/14 08:14:21 downsj Exp $	*/
+/*	$OpenBSD: ite_rb.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite_rb.c,v 1.8 1996/03/03 04:23:38 thorpej Exp $	*/
 
 /*
@@ -58,8 +58,8 @@
 #define REGBASE		((struct rboxfb *)(ip->regbase))
 #define WINDOWMOVER	rbox_windowmove
 
-void	rbox_windowmove __P((struct ite_data *, int, int, int, int,
-	    int, int, int));
+void	rbox_windowmove(struct ite_data *, int, int, int, int,
+	    int, int, int);
 
 void
 rbox_init(ip)
diff --git a/sys/arch/hp300/stand/common/ite_tc.c b/sys/arch/hp300/stand/common/ite_tc.c
index e7800786fd2..52b9e374fc5 100644
--- a/sys/arch/hp300/stand/common/ite_tc.c
+++ b/sys/arch/hp300/stand/common/ite_tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite_tc.c,v 1.1 1997/07/14 08:14:22 downsj Exp $	*/
+/*	$OpenBSD: ite_tc.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: ite_tc.c,v 1.8 1996/03/03 04:23:41 thorpej Exp $	*/
 
 /*
@@ -58,8 +58,8 @@
 #define REGBASE	    	((struct tcboxfb *)(ip->regbase))
 #define WINDOWMOVER 	topcat_windowmove
 
-void	topcat_windowmove __P((struct ite_data *, int, int, int, int,
-	    int, int, int));
+void	topcat_windowmove(struct ite_data *, int, int, int, int,
+	    int, int, int);
 
 void
 topcat_init(ip)
diff --git a/sys/arch/hp300/stand/include/consdefs.h b/sys/arch/hp300/stand/include/consdefs.h
index 81b81c49ce0..3dfcbf7af76 100644
--- a/sys/arch/hp300/stand/include/consdefs.h
+++ b/sys/arch/hp300/stand/include/consdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: consdefs.h,v 1.1 1997/07/14 08:14:31 downsj Exp $	*/
+/*	$OpenBSD: consdefs.h,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: consdefs.h,v 1.2 1997/05/12 07:45:41 thorpej Exp $	*/
 
 /*
@@ -44,26 +44,26 @@ extern	int cons_scode;
  * Console routine prototypes.
  */
 #ifdef ITECONSOLE
-void	iteprobe __P((struct consdev *));
-void	iteinit __P((struct consdev *));
-int	itegetchar __P((dev_t));
-void	iteputchar __P((dev_t, int));
+void	iteprobe(struct consdev *);
+void	iteinit(struct consdev *);
+int	itegetchar(dev_t);
+void	iteputchar(dev_t, int);
 #endif
 #ifdef DCACONSOLE
-void	dcaprobe __P((struct consdev *));
-void	dcainit __P((struct consdev *));
-int	dcagetchar __P((dev_t));
-void	dcaputchar __P((dev_t, int));
+void	dcaprobe(struct consdev *);
+void	dcainit(struct consdev *);
+int	dcagetchar(dev_t);
+void	dcaputchar(dev_t, int);
 #endif
 #ifdef APCICONSOLE
-void	apciprobe __P((struct consdev *));
-void	apciinit __P((struct consdev *));
-int	apcigetchar __P((dev_t));
-void	apciputchar __P((dev_t, int));
+void	apciprobe(struct consdev *);
+void	apciinit(struct consdev *);
+int	apcigetchar(dev_t);
+void	apciputchar(dev_t, int);
 #endif
 #ifdef DCMCONSOLE
-void	dcmprobe __P((struct consdev *));
-void	dcminit __P((struct consdev *));
-int	dcmgetchar __P((dev_t));
-void	dcmputchar __P((dev_t, int));
+void	dcmprobe(struct consdev *);
+void	dcminit(struct consdev *);
+int	dcmgetchar(dev_t);
+void	dcmputchar(dev_t, int);
 #endif
diff --git a/sys/arch/hp300/stand/include/itevar.h b/sys/arch/hp300/stand/include/itevar.h
index 7bf9c8abe52..3d7cea77c1d 100644
--- a/sys/arch/hp300/stand/include/itevar.h
+++ b/sys/arch/hp300/stand/include/itevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: itevar.h,v 1.1 1997/07/14 08:14:35 downsj Exp $	*/
+/*	$OpenBSD: itevar.h,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: itevar.h,v 1.1 1996/03/03 04:23:42 thorpej Exp $	*/
 
 /*
@@ -83,14 +83,14 @@ struct ite_data {
 
 struct itesw {
 	int	ite_hwid;
-	void	(*ite_init) __P((struct ite_data *));
-	void	(*ite_deinit) __P((struct ite_data *));
-	void	(*ite_clear) __P((struct ite_data *, int, int, int, int));
-	void	(*ite_putc) __P((struct ite_data *, int, int, int, int));
-	void	(*ite_cursor) __P((struct ite_data *, int));
-	void	(*ite_scroll) __P((struct ite_data *, int, int, int, int));
-	u_char	(*ite_readbyte) __P((struct ite_data *, int));
-	void	(*ite_writeglyph) __P((struct ite_data *, u_char *, u_char *));
+	void	(*ite_init)(struct ite_data *);
+	void	(*ite_deinit)(struct ite_data *);
+	void	(*ite_clear)(struct ite_data *, int, int, int, int);
+	void	(*ite_putc)(struct ite_data *, int, int, int, int);
+	void	(*ite_cursor)(struct ite_data *, int);
+	void	(*ite_scroll)(struct ite_data *, int, int, int, int);
+	u_char	(*ite_readbyte)(struct ite_data *, int);
+	void	(*ite_writeglyph)(struct ite_data *, u_char *, u_char *);
 };
 
 /* Flags */
@@ -195,38 +195,38 @@ extern	int nitesw;
 /*
  * Prototypes.
  */
-u_char	ite_readbyte __P((struct ite_data *, int));
-void	ite_writeglyph __P((struct ite_data *, u_char *, u_char *));
+u_char	ite_readbyte(struct ite_data *, int);
+void	ite_writeglyph(struct ite_data *, u_char *, u_char *);
 
 /*
  * Framebuffer-specific ITE prototypes.
  */
-void	topcat_init __P((struct ite_data *));
-void	topcat_clear __P((struct ite_data *, int, int, int, int));
-void	topcat_putc __P((struct ite_data *, int, int, int, int));
-void	topcat_cursor __P((struct ite_data *, int));
-void	topcat_scroll __P((struct ite_data *, int, int, int, int));
-
-void	gbox_init __P((struct ite_data *));
-void	gbox_clear __P((struct ite_data *, int, int, int, int));
-void	gbox_putc __P((struct ite_data *, int, int, int, int));
-void	gbox_cursor __P((struct ite_data *, int));
-void	gbox_scroll __P((struct ite_data *, int, int, int, int));
-
-void	rbox_init __P((struct ite_data *));
-void	rbox_clear __P((struct ite_data *, int, int, int, int));
-void	rbox_putc __P((struct ite_data *, int, int, int, int));
-void	rbox_cursor __P((struct ite_data *, int));
-void	rbox_scroll __P((struct ite_data *, int, int, int, int));
-
-void	dvbox_init __P((struct ite_data *));
-void	dvbox_clear __P((struct ite_data *, int, int, int, int));
-void	dvbox_putc __P((struct ite_data *, int, int, int, int));
-void	dvbox_cursor __P((struct ite_data *, int));
-void	dvbox_scroll __P((struct ite_data *, int, int, int, int));
-
-void	hyper_init __P((struct ite_data *));
-void	hyper_clear __P((struct ite_data *, int, int, int, int));
-void	hyper_putc __P((struct ite_data *, int, int, int, int));
-void	hyper_cursor __P((struct ite_data *, int));
-void	hyper_scroll __P((struct ite_data *, int, int, int, int));
+void	topcat_init(struct ite_data *);
+void	topcat_clear(struct ite_data *, int, int, int, int);
+void	topcat_putc(struct ite_data *, int, int, int, int);
+void	topcat_cursor(struct ite_data *, int);
+void	topcat_scroll(struct ite_data *, int, int, int, int);
+
+void	gbox_init(struct ite_data *);
+void	gbox_clear(struct ite_data *, int, int, int, int);
+void	gbox_putc(struct ite_data *, int, int, int, int);
+void	gbox_cursor(struct ite_data *, int);
+void	gbox_scroll(struct ite_data *, int, int, int, int);
+
+void	rbox_init(struct ite_data *);
+void	rbox_clear(struct ite_data *, int, int, int, int);
+void	rbox_putc(struct ite_data *, int, int, int, int);
+void	rbox_cursor(struct ite_data *, int);
+void	rbox_scroll(struct ite_data *, int, int, int, int);
+
+void	dvbox_init(struct ite_data *);
+void	dvbox_clear(struct ite_data *, int, int, int, int);
+void	dvbox_putc(struct ite_data *, int, int, int, int);
+void	dvbox_cursor(struct ite_data *, int);
+void	dvbox_scroll(struct ite_data *, int, int, int, int);
+
+void	hyper_init(struct ite_data *);
+void	hyper_clear(struct ite_data *, int, int, int, int);
+void	hyper_putc(struct ite_data *, int, int, int, int);
+void	hyper_cursor(struct ite_data *, int);
+void	hyper_scroll(struct ite_data *, int, int, int, int);
diff --git a/sys/arch/hp300/stand/include/kbdvar.h b/sys/arch/hp300/stand/include/kbdvar.h
index c4a3b8e845f..ab2b96ec854 100644
--- a/sys/arch/hp300/stand/include/kbdvar.h
+++ b/sys/arch/hp300/stand/include/kbdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbdvar.h,v 1.1 1997/07/14 08:14:36 downsj Exp $	*/
+/*	$OpenBSD: kbdvar.h,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: kbdvar.h,v 1.1 1997/04/14 19:00:13 thorpej Exp $	*/
 
 /*-
@@ -43,9 +43,9 @@
  */
 
 struct kbdsw {
-	int	(*k_getc) __P((void));	/* get character */
-	void	(*k_nmi) __P((void));	/* handle non-maskable interrupt */
-	int	(*k_init) __P((void));	/* probe/initialize keyboard */
+	int	(*k_getc)(void);	/* get character */
+	void	(*k_nmi)(void);	/* handle non-maskable interrupt */
+	int	(*k_init)(void);	/* probe/initialize keyboard */
 };
 
 #ifdef ITECONSOLE
@@ -53,14 +53,14 @@ struct kbdsw {
 extern struct kbdsw kbdsw[];
 
 #ifdef HIL_KEYBOARD
-int	hilkbd_getc __P((void));
-void	hilkbd_nmi __P((void));
-int	hilkbd_init __P((void));
+int	hilkbd_getc(void);
+void	hilkbd_nmi(void);
+int	hilkbd_init(void);
 #endif
 
 #ifdef DOMAIN_KEYBOARD
-int	dnkbd_getc __P((void));
-void	dnkbd_nmi __P((void));
-int	dnkbd_init __P((void));
+int	dnkbd_getc(void);
+void	dnkbd_nmi(void);
+int	dnkbd_init(void);
 #endif
 #endif /* ITECONSOLE */
diff --git a/sys/arch/hp300/stand/include/samachdep.h b/sys/arch/hp300/stand/include/samachdep.h
index 2baca599694..5cb2b122494 100644
--- a/sys/arch/hp300/stand/include/samachdep.h
+++ b/sys/arch/hp300/stand/include/samachdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: samachdep.h,v 1.2 1997/09/14 07:02:03 downsj Exp $	*/
+/*	$OpenBSD: samachdep.h,v 1.3 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: samachdep.h,v 1.3 1997/05/12 07:54:45 thorpej Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ extern	u_int bootdev;
 extern	char *getmachineid();
 
 extern	int userom;
-extern	void romputchar __P((int));
+extern	void romputchar(int);
 
 #define DELAY(n)	{ register int N = cpuspeed * (n); while (--N > 0); }
 
@@ -82,7 +82,7 @@ struct grfinfo {
  * Switch we use to set punit in devopen.
  */
 struct punitsw {
-	int	(*p_punit) __P((int, int, int *));
+	int	(*p_punit)(int, int, int *);
 };
 extern	struct punitsw punitsw[];
 extern	int npunit;
diff --git a/sys/arch/hp300/stand/libsa/rawfs.c b/sys/arch/hp300/stand/libsa/rawfs.c
index 275fef8a686..79b1853598c 100644
--- a/sys/arch/hp300/stand/libsa/rawfs.c
+++ b/sys/arch/hp300/stand/libsa/rawfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rawfs.c,v 1.1 1997/07/14 08:14:48 downsj Exp $	*/
+/*	$OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: rawfs.c,v 1.2 1996/10/06 19:07:53 thorpej Exp $	*/
 
 /*
@@ -60,7 +60,7 @@ struct rawfs_file {
 };
 
 static int
-rawfs_get_block __P((struct open_file *));
+rawfs_get_block(struct open_file *);
 
 int
 rawfs_open(path, f)
diff --git a/sys/arch/hp300/stand/libsa/rawfs.h b/sys/arch/hp300/stand/libsa/rawfs.h
index c37ed16fb93..0838daab2f8 100644
--- a/sys/arch/hp300/stand/libsa/rawfs.h
+++ b/sys/arch/hp300/stand/libsa/rawfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rawfs.h,v 1.1 1997/07/14 08:14:49 downsj Exp $	*/
+/*	$OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: rawfs.h,v 1.1 1996/06/26 17:44:36 thorpej Exp $	*/
 
 /*
@@ -6,11 +6,11 @@
  * No random access, only sequential read allowed.
  */
 
-int	rawfs_open __P((char *path, struct open_file *f));
-int	rawfs_close __P((struct open_file *f));
-int	rawfs_read __P((struct open_file *f, void *buf,
-		u_int size, u_int *resid));
-int	rawfs_write __P((struct open_file *f, void *buf,
-		u_int size, u_int *resid));
-off_t	rawfs_seek __P((struct open_file *f, off_t offset, int where));
-int	rawfs_stat __P((struct open_file *f, struct stat *sb));
+int	rawfs_open(char *path, struct open_file *f);
+int	rawfs_close(struct open_file *f);
+int	rawfs_read(struct open_file *f, void *buf,
+		u_int size, u_int *resid);
+int	rawfs_write(struct open_file *f, void *buf,
+		u_int size, u_int *resid);
+off_t	rawfs_seek(struct open_file *f, off_t offset, int where);
+int	rawfs_stat(struct open_file *f, struct stat *sb);
diff --git a/sys/arch/hp300/stand/uboot/conf.c b/sys/arch/hp300/stand/uboot/conf.c
index 7a5b04b020d..88374a8eb1a 100644
--- a/sys/arch/hp300/stand/uboot/conf.c
+++ b/sys/arch/hp300/stand/uboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.2 1997/09/14 07:02:05 downsj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.3 2002/03/14 01:26:31 millert Exp $	*/
 /*	$NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $	*/
 
 /*
@@ -58,30 +58,30 @@ int	debug = 0;	/* XXX */
 /*
  * Device configuration
  */
-int	netstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int	netopen __P((struct open_file *, ...));
-int	netclose __P((struct open_file *));
+int	netstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	netopen(struct open_file *, ...);
+int	netclose(struct open_file *);
 #define netioctl	noioctl
 
-int	ctstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int	ctopen __P((struct open_file *, ...));
-int	ctclose __P((struct open_file *));
+int	ctstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	ctopen(struct open_file *, ...);
+int	ctclose(struct open_file *);
 #define	ctioctl		noioctl
 
-int	hdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int	hdopen __P((struct open_file *, ...));
-int	hdclose __P((struct open_file *));
+int	hdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	hdopen(struct open_file *, ...);
+int	hdclose(struct open_file *);
 #define hdioctl		noioctl
 
-int	sdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int	sdopen __P((struct open_file *, ...));
-int	sdclose __P((struct open_file *));
+int	sdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	sdopen(struct open_file *, ...);
+int	sdclose(struct open_file *);
 #define	sdioctl		noioctl
 
 #define xxstrategy	\
-	(int (*) __P((void *, int, daddr_t, size_t, void *, size_t *)))nullsys
-#define xxopen		(int (*) __P((struct open_file *, ...)))nodev
-#define xxclose		(int (*) __P((struct open_file *)))nullsys
+	(int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys
+#define xxopen		(int (*)(struct open_file *, ...))nodev
+#define xxclose		(int (*)(struct open_file *))nullsys
 
 /*
  * Note: "le" isn't a major offset.
@@ -107,7 +107,7 @@ int	n_netif_drivers = (sizeof(netif_drivers) / sizeof(netif_drivers[0]));
 /*
  * Physical unit/lun detection.
  */
-int	punitzero __P((int, int, int *));
+int	punitzero(int, int, int *);
 
 int
 punitzero(ctlr, slave, punit)
@@ -118,7 +118,7 @@ punitzero(ctlr, slave, punit)
 	return (0);
 }
 
-extern	int ctpunit __P((int, int, int *));
+extern	int ctpunit(int, int, int *);
 #define	xxpunit		punitzero
 #define	hdpunit		punitzero
 #define	sdpunit		punitzero