First round of __P removal in sys

4 files changed, 44 insertions, 44 deletions

diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c
index 6a075a6b785..fd3377490b8 100644
--- a/sys/arch/mvmeppc/pci/mpcpcibr.c
+++ b/sys/arch/mvmeppc/pci/mpcpcibr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibr.c,v 1.7 2001/11/06 22:46:00 miod Exp $ */
+/*	$OpenBSD: mpcpcibr.c,v 1.8 2002/03/14 01:26:41 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -55,24 +55,24 @@
 #include <mvmeppc/pci/pcibrvar.h>
 #include <mvmeppc/dev/ravenreg.h>
 
-int    mpcpcibrmatch __P((struct device *, void *, void *));
-void   mpcpcibrattach __P((struct device *, struct device *, void *));
+int    mpcpcibrmatch(struct device *, void *, void *);
+void   mpcpcibrattach(struct device *, struct device *, void *);
 
-void   mpc_attach_hook __P((struct device *, struct device *,
-									 struct pcibus_attach_args *));
-int    mpc_bus_maxdevs __P((void *, int));
-pcitag_t mpc_make_tag __P((void *, int, int, int));
-void   mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *));
-pcireg_t mpc_conf_read __P((void *, pcitag_t, int));
-void   mpc_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void   mpc_attach_hook(struct device *, struct device *,
+									 struct pcibus_attach_args *);
+int    mpc_bus_maxdevs(void *, int);
+pcitag_t mpc_make_tag(void *, int, int, int);
+void   mpc_decompose_tag(void *, pcitag_t, int *, int *, int *);
+pcireg_t mpc_conf_read(void *, pcitag_t, int);
+void   mpc_conf_write(void *, pcitag_t, int, pcireg_t);
 
-int      mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *));
-const char *mpc_intr_string __P((void *, pci_intr_handle_t));
-int	 mpc_intr_line __P((void *, pci_intr_handle_t));
+int      mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
+const char *mpc_intr_string(void *, pci_intr_handle_t);
+int	 mpc_intr_line(void *, pci_intr_handle_t);
 void     *mpc_intr_establish __P((void *, pci_intr_handle_t,
 											 int, int (*func)(void *), void *, char *));
-void     mpc_intr_disestablish __P((void *, void *));
-int      mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *));
+void     mpc_intr_disestablish(void *, void *);
+int      mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 
 void
 mpc_cfg_write_1( struct pcibr_config *cp, u_int32_t reg, u_int8_t val);
@@ -98,7 +98,7 @@ struct cfdriver mpcpcibr_cd = {
 	NULL, "mpcpcibr", DV_DULL,
 };
 
-static int      mpcpcibrprint __P((void *, const char *pnp));
+static int      mpcpcibrprint(void *, const char *pnp);
 
 struct pcibr_config mpc_config;
 
@@ -539,7 +539,7 @@ mpc_intr_line(lcv, ih)
 
 typedef void     *(intr_establish_t) __P((void *, pci_intr_handle_t,
 														int, int, int (*func)(void *), void *, char *));
-typedef void     (intr_disestablish_t) __P((void *, void *));
+typedef void     (intr_disestablish_t)(void *, void *);
 extern intr_establish_t *intr_establish_func;
 extern intr_disestablish_t *intr_disestablish_func;
 
@@ -548,7 +548,7 @@ mpc_intr_establish(lcv, ih, level, func, arg, name)
 void *lcv;
 pci_intr_handle_t ih;
 int level;
-int (*func) __P((void *));
+int (*func)(void *);
 void *arg;
 char *name;
 {
diff --git a/sys/arch/mvmeppc/pci/pchb.c b/sys/arch/mvmeppc/pci/pchb.c
index 0fa85f3183f..a592a3a0982 100644
--- a/sys/arch/mvmeppc/pci/pchb.c
+++ b/sys/arch/mvmeppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.3 2001/11/06 22:46:00 miod Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.4 2002/03/14 01:26:41 millert Exp $	*/
 /*	$NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $	*/
 
 /*-
@@ -48,8 +48,8 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
-int	pchbmatch __P((struct device *, void *, void *));
-void	pchbattach __P((struct device *, struct device *, void *));
+int	pchbmatch(struct device *, void *, void *);
+void	pchbattach(struct device *, struct device *, void *);
 
 struct cfattach pchb_ca = {
 	sizeof(struct device), pchbmatch, pchbattach
diff --git a/sys/arch/mvmeppc/pci/pcib.c b/sys/arch/mvmeppc/pci/pcib.c
index 2f7a56b5193..b442e174d92 100644
--- a/sys/arch/mvmeppc/pci/pcib.c
+++ b/sys/arch/mvmeppc/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcib.c,v 1.1 2001/06/26 21:57:57 smurph Exp $	*/
+/*	$OpenBSD: pcib.c,v 1.2 2002/03/14 01:26:41 millert Exp $	*/
 /*	$NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $	*/
 
 /*-
@@ -53,10 +53,10 @@
 
 #include "isa.h"
 
-int	pcibmatch __P((struct device *, void *, void *));
-void	pcibattach __P((struct device *, struct device *, void *));
-void	pcib_callback __P((struct device *));
-int	pcib_print __P((void *, const char *));
+int	pcibmatch(struct device *, void *, void *);
+void	pcibattach(struct device *, struct device *, void *);
+void	pcib_callback(struct device *);
+int	pcib_print(void *, const char *);
 
 struct ppc_bus_space ppc_isa_io, ppc_isa_mem;
 
diff --git a/sys/arch/mvmeppc/pci/raven.c b/sys/arch/mvmeppc/pci/raven.c
index 5df8ca8e3aa..c94ab28c367 100644
--- a/sys/arch/mvmeppc/pci/raven.c
+++ b/sys/arch/mvmeppc/pci/raven.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raven.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */
+/*	$OpenBSD: raven.c,v 1.6 2002/03/14 01:26:41 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -55,24 +55,24 @@
 #include <mvmeppc/pci/pcibrvar.h>
 #include <mvmeppc/pci/ravenreg.h>
 
-int	 mpcpcibrmatch __P((struct device *, void *, void *));
-void	 mpcpcibrattach __P((struct device *, struct device *, void *));
+int	 mpcpcibrmatch(struct device *, void *, void *);
+void	 mpcpcibrattach(struct device *, struct device *, void *);
 
-void	 mpc_attach_hook __P((struct device *, struct device *,
-				struct pcibus_attach_args *));
-int	 mpc_bus_maxdevs __P((void *, int));
-pcitag_t mpc_make_tag __P((void *, int, int, int));
-void	 mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *));
-pcireg_t mpc_conf_read __P((void *, pcitag_t, int));
-void	 mpc_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void	 mpc_attach_hook(struct device *, struct device *,
+				struct pcibus_attach_args *);
+int	 mpc_bus_maxdevs(void *, int);
+pcitag_t mpc_make_tag(void *, int, int, int);
+void	 mpc_decompose_tag(void *, pcitag_t, int *, int *, int *);
+pcireg_t mpc_conf_read(void *, pcitag_t, int);
+void	 mpc_conf_write(void *, pcitag_t, int, pcireg_t);
 
-int      mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *));
-const char *mpc_intr_string __P((void *, pci_intr_handle_t));
-int	 mpc_intr_line __P((void *, pci_intr_handle_t));
+int      mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
+const char *mpc_intr_string(void *, pci_intr_handle_t);
+int	 mpc_intr_line(void *, pci_intr_handle_t);
 void     *mpc_intr_establish __P((void *, pci_intr_handle_t,
             int, int (*func)(void *), void *, char *));
-void     mpc_intr_disestablish __P((void *, void *));
-int      mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *));
+void     mpc_intr_disestablish(void *, void *);
+int      mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 
 struct cfattach mpcpcibr_ca = {
         sizeof(struct pcibr_softc), mpcpcibrmatch, mpcpcibrattach,
@@ -82,7 +82,7 @@ struct cfdriver mpcpcibr_cd = {
 	NULL, "mpcpcibr", DV_DULL,
 };
 
-static int      mpcpcibrprint __P((void *, const char *pnp));
+static int      mpcpcibrprint(void *, const char *pnp);
 
 struct pcibr_config mpc_config;
 
@@ -485,7 +485,7 @@ mpc_intr_string(lcv, ih)
 
 typedef void     *(intr_establish_t) __P((void *, pci_intr_handle_t,
             int, int, int (*func)(void *), void *, char *));
-typedef void     (intr_disestablish_t) __P((void *, void *));
+typedef void     (intr_disestablish_t)(void *, void *);
 extern intr_establish_t *intr_establish_func;
 extern intr_disestablish_t *intr_disestablish_func;
 
@@ -494,7 +494,7 @@ mpc_intr_establish(lcv, ih, level, func, arg, name)
 	void *lcv;
 	pci_intr_handle_t ih;
 	int level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 	char *name;
 {