Final __P removal plus some cosmetic fixups

6 files changed, 18 insertions, 18 deletions

diff --git a/sys/arch/hp300/dev/diovar.h b/sys/arch/hp300/dev/diovar.h
index b211dc371a3..61c1f156170 100644
--- a/sys/arch/hp300/dev/diovar.h
+++ b/sys/arch/hp300/dev/diovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diovar.h,v 1.4 2002/03/14 01:26:30 millert Exp $	*/
+/*	$OpenBSD: diovar.h,v 1.5 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: diovar.h,v 1.3 1997/05/05 21:01:33 thorpej Exp $	*/
 
 /*-
@@ -77,6 +77,6 @@ struct dio_devdesc {
 
 #ifdef _KERNEL
 void	*dio_scodetopa(int);
-void	*dio_intr_establish __P((int (*)(void *), void *, int, int));
+void	*dio_intr_establish(int (*)(void *), void *, int, int);
 void	dio_intr_disestablish(void *);
 #endif /* _KERNEL */
diff --git a/sys/arch/hp300/dev/frodovar.h b/sys/arch/hp300/dev/frodovar.h
index 6958d75eef9..1377ac8d10c 100644
--- a/sys/arch/hp300/dev/frodovar.h
+++ b/sys/arch/hp300/dev/frodovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frodovar.h,v 1.2 2002/03/14 01:26:30 millert Exp $	*/
+/*	$OpenBSD: frodovar.h,v 1.3 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: frodovar.h,v 1.1 1997/05/12 08:03:50 thorpej Exp $	*/
 
 /*
@@ -44,6 +44,6 @@ struct frodo_attach_args {
 #define	frodocf_offset	cf_loc[0]
 #define	FRODO_UNKNOWN_OFFSET	-1
 
-void	frodo_intr_establish __P((struct device *, int (*func)(void *),
-	    void *, int, int));
+void	frodo_intr_establish(struct device *, int (*func)(void *),
+	    void *, int, int);
 void	frodo_intr_disestablish(struct device *, int);
diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h
index 1c6a8ea3f3b..59ebc83f359 100644
--- a/sys/arch/hp300/dev/grfvar.h
+++ b/sys/arch/hp300/dev/grfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $	*/
+/*	$OpenBSD: grfvar.h,v 1.8 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $	*/
 
 /*
@@ -151,7 +151,7 @@ int	grflckunmmap(dev_t, caddr_t);
 
 /* grf_subr.c prototypes */
 struct itesw;
-void	grfdev_attach __P((struct grfdev_softc *,
+void	grfdev_attach(struct grfdev_softc *,
 	    int (*init)(struct grf_data *, int, caddr_t),
-	    caddr_t, struct grfsw *, struct itesw *itesw));
+	    caddr_t, struct grfsw *, struct itesw *itesw);
 #endif /* _KERNEL */
diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c
index 67d075c5379..4a75e4f737e 100644
--- a/sys/arch/hp300/hp300/db_memrw.c
+++ b/sys/arch/hp300/hp300/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_memrw.c,v 1.8 2002/03/14 01:26:30 millert Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.9 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $	*/
 
 /*-
@@ -81,15 +81,15 @@ db_read_bytes(addr, size, data)
 	size_t		size;
 	char		*data;
 {
-	char	*src = (char*)addr;
+	char	*src = (char *)addr;
 
 	if (size == 4) {
-		*((int*)data) = *((int*)src);
+		*((int *)data) = *((int *)src);
 		return;
 	}
 
 	if (size == 2) {
-		*((short*)data) = *((short*)src);
+		*((short *)data) = *((short *)src);
 		return;
 	}
 
@@ -209,12 +209,12 @@ db_write_bytes(addr, size, data)
 	}
 
 	if (size == 4) {
-		*((int*)dst) = *((int*)data);
+		*((int *)dst) = *((int *)data);
 		return;
 	}
 
 	if (size == 2) {
-		*((short*)dst) = *((short*)data);
+		*((short *)dst) = *((short *)data);
 		return;
 	}
 
diff --git a/sys/arch/hp300/include/autoconf.h b/sys/arch/hp300/include/autoconf.h
index b21ee54e212..4b1d224559f 100644
--- a/sys/arch/hp300/include/autoconf.h
+++ b/sys/arch/hp300/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.7 2002/03/14 01:26:31 millert Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.8 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.4 1997/04/01 03:03:56 scottr Exp $	*/
 
 /*-
@@ -45,7 +45,7 @@ extern	int convasize;			/* size of mapping at conaddr */
 extern	int conforced;			/* console has been forced */
 
 void	hp300_cninit(void);
-void	console_scan __P((int (*)(int, caddr_t, void *), void *));
+void	console_scan(int (*)(int, caddr_t, void *), void *);
 caddr_t	iomap(caddr_t, int);
 void	iounmap(caddr_t, int);
 #endif /* _KERNEL */
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 2ede3c194a8..9465fbacf27 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.7 2002/03/14 01:26:31 millert Exp $	*/
+/*	$OpenBSD: intr.h,v 1.8 2002/03/14 03:15:52 millert Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $	*/
 
 /*-
@@ -178,7 +178,7 @@ int	spl0(void);
 
 /* intr.c */
 void	intr_init(void);
-void	*intr_establish __P((int (*)(void *), void *, int, int));
+void	*intr_establish(int (*)(void *), void *, int, int);
 void	intr_disestablish(void *);
 void	intr_dispatch(int);
 void	intr_printlevels(void);