First round of __P removal in sys

17 files changed, 135 insertions, 136 deletions

diff --git a/sys/arch/i386/pci/amd756.c b/sys/arch/i386/pci/amd756.c
index 5a18cbb5ba3..bd86f45dd1d 100644
--- a/sys/arch/i386/pci/amd756.c
+++ b/sys/arch/i386/pci/amd756.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd756.c,v 1.2 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: amd756.c,v 1.3 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -89,13 +89,13 @@ struct viper_handle {
 	pcitag_t ph_tag;
 };
 
-int amd756_getclink __P((pciintr_icu_handle_t, int, int *));
-int amd756_get_intr __P((pciintr_icu_handle_t, int, int *));
-int amd756_set_intr __P((pciintr_icu_handle_t, int, int));
-int amd756_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int amd756_set_trigger __P((pciintr_icu_handle_t, int, int));
+int amd756_getclink(pciintr_icu_handle_t, int, int *);
+int amd756_get_intr(pciintr_icu_handle_t, int, int *);
+int amd756_set_intr(pciintr_icu_handle_t, int, int);
+int amd756_get_trigger(pciintr_icu_handle_t, int, int *);
+int amd756_set_trigger(pciintr_icu_handle_t, int, int);
 #ifdef VIPER_DEBUG
-static void amd756_pir_dump __P((struct viper_handle *));
+static void amd756_pir_dump(struct viper_handle *);
 #endif
 
 const struct pciintr_icu amd756_pci_icu = {
diff --git a/sys/arch/i386/pci/opti82c558.c b/sys/arch/i386/pci/opti82c558.c
index 4fc45b674c4..6a240fb13c0 100644
--- a/sys/arch/i386/pci/opti82c558.c
+++ b/sys/arch/i386/pci/opti82c558.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c558.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: opti82c558.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: opti82c558.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,11 +82,11 @@
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/opti82c558reg.h>
 
-int	opti82c558_getclink __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_set_intr __P((pciintr_icu_handle_t, int, int));
-int	opti82c558_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	opti82c558_getclink(pciintr_icu_handle_t, int, int *);
+int	opti82c558_get_intr(pciintr_icu_handle_t, int, int *);
+int	opti82c558_set_intr(pciintr_icu_handle_t, int, int);
+int	opti82c558_get_trigger(pciintr_icu_handle_t, int, int *);
+int	opti82c558_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu opti82c558_pci_icu = {
 	opti82c558_getclink,
diff --git a/sys/arch/i386/pci/opti82c700.c b/sys/arch/i386/pci/opti82c700.c
index 9b9fb779383..07766921546 100644
--- a/sys/arch/i386/pci/opti82c700.c
+++ b/sys/arch/i386/pci/opti82c700.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c700.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: opti82c700.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: opti82c700.c,v 1.2 2000/07/18 11:07:20 soda Exp $	*/
 
 /*-
@@ -88,11 +88,11 @@
 #define	DPRINTF(arg)
 #endif
 
-int	opti82c700_getclink __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_set_intr __P((pciintr_icu_handle_t, int, int));
-int	opti82c700_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	opti82c700_getclink(pciintr_icu_handle_t, int, int *);
+int	opti82c700_get_intr(pciintr_icu_handle_t, int, int *);
+int	opti82c700_set_intr(pciintr_icu_handle_t, int, int);
+int	opti82c700_get_trigger(pciintr_icu_handle_t, int, int *);
+int	opti82c700_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu opti82c700_pci_icu = {
 	opti82c700_getclink,
@@ -107,9 +107,9 @@ struct opti82c700_handle {
 	pcitag_t ph_tag;
 };
 
-int	opti82c700_addr __P((int, int *, int *));
+int	opti82c700_addr(int, int *, int *);
 #ifdef FIRESTARDEBUG
-void	opti82c700_pir_dump __P((struct opti82c700_handle *));
+void	opti82c700_pir_dump(struct opti82c700_handle *);
 #endif
 
 int
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 071f940b36f..8c30e8e1cf2 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.28 2001/12/31 23:38:53 mickey Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.29 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $	*/
 
 /*
@@ -115,10 +115,10 @@ struct pchb_softc {
 	struct timeout sc_tmo;
 };
 
-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 *);
 
-int	pchb_print __P((void *, const char *));
+int	pchb_print(void *, const char *);
 
 struct cfattach pchb_ca = {
 	sizeof(struct pchb_softc), pchbmatch, pchbattach
@@ -128,7 +128,7 @@ struct cfdriver pchb_cd = {
 	NULL, "pchb", DV_DULL
 };
 
-void pchb_rnd __P((void *v));
+void pchb_rnd(void *v);
 
 int
 pchbmatch(parent, match, aux)
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c
index 025e3c1e4d0..bda77df0a85 100644
--- a/sys/arch/i386/pci/pci_addr_fixup.c
+++ b/sys/arch/i386/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_addr_fixup.c,v 1.12 2001/12/04 06:32:06 mickey Exp $	*/
+/*	$OpenBSD: pci_addr_fixup.c,v 1.13 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $	*/
 
 /*-
@@ -42,25 +42,24 @@
 
 #include <i386/pci/pcibiosvar.h>
 
-typedef int (*pciaddr_resource_manage_func_t) 
-	__P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int,
-	struct extent *, int, bus_addr_t *, bus_size_t));
-void	pciaddr_resource_manage __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t));
-void	pciaddr_resource_reserve __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t));
-int	pciaddr_do_resource_reserve __P((struct pcibios_softc *,
+typedef int (*pciaddr_resource_manage_func_t)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int,
+	struct extent *, int, bus_addr_t *, bus_size_t);
+void	pciaddr_resource_manage(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t);
+void	pciaddr_resource_reserve(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t);
+int	pciaddr_do_resource_reserve(struct pcibios_softc *,
     pci_chipset_tag_t, pcitag_t, int, struct extent *, int,
-    bus_addr_t *, bus_size_t));
-void	pciaddr_resource_allocate __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t));
-int	pciaddr_do_resource_allocate __P((struct pcibios_softc *,
+    bus_addr_t *, bus_size_t);
+void	pciaddr_resource_allocate(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t);
+int	pciaddr_do_resource_allocate(struct pcibios_softc *,
     pci_chipset_tag_t, pcitag_t, int, struct extent *, int, bus_addr_t *,
-    bus_size_t));
-bus_addr_t pciaddr_ioaddr __P((u_int32_t));
-void	pciaddr_print_devid __P((pci_chipset_tag_t, pcitag_t));
+    bus_size_t);
+bus_addr_t pciaddr_ioaddr(u_int32_t);
+void	pciaddr_print_devid(pci_chipset_tag_t, pcitag_t);
 
-int	pciaddr_device_is_agp __P((pci_chipset_tag_t, pcitag_t));
+int	pciaddr_device_is_agp(pci_chipset_tag_t, pcitag_t);
 
 #define PCIADDR_MEM_START	0x0
 #define PCIADDR_MEM_END		0xffffffff
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c
index 3d975586aa2..a5e2d5c9791 100644
--- a/sys/arch/i386/pci/pci_intr_fixup.c
+++ b/sys/arch/i386/pci/pci_intr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_intr_fixup.c,v 1.21 2002/02/20 19:01:19 mickey Exp $	*/
+/*	$OpenBSD: pci_intr_fixup.c,v 1.22 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $	*/
 
 /*
@@ -126,18 +126,18 @@ pciintr_icu_handle_t pciintr_icu_handle;
 int pcibios_irqs_hint = PCIBIOS_IRQS_HINT;
 #endif
 
-struct pciintr_link_map *pciintr_link_lookup __P((int));
-struct pcibios_intr_routing *pciintr_pir_lookup __P((int, int));
-int	pciintr_bitmap_count_irq __P((int, int *));
+struct pciintr_link_map *pciintr_link_lookup(int);
+struct pcibios_intr_routing *pciintr_pir_lookup(int, int);
+int	pciintr_bitmap_count_irq(int, int *);
 
 SIMPLEQ_HEAD(, pciintr_link_map) pciintr_link_map_list;
 
 const struct pciintr_icu_table {
 	pci_vendor_id_t	piit_vendor;
 	pci_product_id_t piit_product;
-	int (*piit_init) __P((pci_chipset_tag_t,
+	int (*piit_init)(pci_chipset_tag_t,
 		bus_space_tag_t, pcitag_t, pciintr_icu_tag_t *,
-		pciintr_icu_handle_t *));
+		pciintr_icu_handle_t *);
 } pciintr_icu_table[] = {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82371MX,
 	  piix_init },
@@ -181,7 +181,7 @@ const struct pciintr_icu_table {
 	  NULL },
 };
 
-const struct pciintr_icu_table *pciintr_icu_lookup __P((pcireg_t));
+const struct pciintr_icu_table *pciintr_icu_lookup(pcireg_t);
 
 const struct pciintr_icu_table *
 pciintr_icu_lookup(id)
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index d0ea039a240..7ac9f5336d3 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.22 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.23 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $	*/
 
 /*-
@@ -486,7 +486,7 @@ void *
 pci_intr_establish(pc, ih, level, func, arg, what)
 	pci_chipset_tag_t pc;
 	pci_intr_handle_t ih;
-	int level, (*func) __P((void *));
+	int level, (*func)(void *);
 	void *arg;
 	char *what;
 {
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index 911dc7f897a..553136a4529 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.9 2001/08/25 10:13:29 art Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $	*/
 
 /*
@@ -75,28 +75,28 @@ struct {
  * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
  */
 extern int pci_mode;
-int		pci_mode_detect __P((void));
+int		pci_mode_detect(void);
 
 /*
  * Functions provided to machine-independent PCI code.
  */
-void		pci_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		pci_bus_maxdevs __P((pci_chipset_tag_t, int));
-pcitag_t	pci_make_tag __P((pci_chipset_tag_t, int, int, int));
-pcireg_t	pci_conf_read __P((pci_chipset_tag_t, pcitag_t, int));
-void		pci_conf_write __P((pci_chipset_tag_t, pcitag_t, int,
-		    pcireg_t));
+void		pci_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		pci_bus_maxdevs(pci_chipset_tag_t, int);
+pcitag_t	pci_make_tag(pci_chipset_tag_t, int, int, int);
+pcireg_t	pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
+void		pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
+		    pcireg_t);
 struct pci_attach_args;
-int		pci_intr_map __P((struct pci_attach_args *,
-		    pci_intr_handle_t *));
+int		pci_intr_map(struct pci_attach_args *,
+		    pci_intr_handle_t *);
 #define		pci_intr_line(ih)	((ih).line)
-const char	*pci_intr_string __P((pci_chipset_tag_t, pci_intr_handle_t));
+const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t,
 		    int, int (*)(void *), void *, char *));
-void		pci_intr_disestablish __P((pci_chipset_tag_t, void *));
-void		pci_decompose_tag __P((pci_chipset_tag_t, pcitag_t,
-		    int *, int *, int *));
+void		pci_intr_disestablish(pci_chipset_tag_t, void *);
+void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
+		    int *, int *, int *);
 
 /*
  * Section 6.2.4, `Miscellaneous Functions' of the PIC Specification,
diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c
index be4ef0b37b5..056f67fda5c 100644
--- a/sys/arch/i386/pci/pcib.c
+++ b/sys/arch/i386/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcib.c,v 1.8 2001/01/27 04:59:40 mickey Exp $	*/
+/*	$OpenBSD: pcib.c,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $	*/
 
 /*-
@@ -56,10 +56,10 @@
 #include <i386/pci/pcibiosvar.h>
 #endif
 
-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 cfattach pcib_ca = {
 	sizeof(struct device), pcibmatch, pcibattach
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 9de6e27fcab..b21383c977d 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibios.c,v 1.24 2001/05/12 19:12:44 mickey Exp $	*/
+/*	$OpenBSD: pcibios.c,v 1.25 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $	*/
 
 /*
@@ -122,18 +122,18 @@ int pcibios_flags = 0;
 struct bios32_entry pcibios_entry;
 struct bios32_entry_info pcibios_entry_info;
 
-struct pcibios_intr_routing *pcibios_pir_init __P((struct pcibios_softc *));
+struct pcibios_intr_routing *pcibios_pir_init(struct pcibios_softc *);
 
-int	pcibios_get_status __P((struct pcibios_softc *,
+int	pcibios_get_status(struct pcibios_softc *,
 	    u_int32_t *, u_int32_t *, u_int32_t *,
-	    u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *));
-int	pcibios_get_intr_routing __P((struct pcibios_softc *,
-	    struct pcibios_intr_routing *, int *, u_int16_t *));
+	    u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *);
+int	pcibios_get_intr_routing(struct pcibios_softc *,
+	    struct pcibios_intr_routing *, int *, u_int16_t *);
 
-int	pcibios_return_code __P((struct pcibios_softc *, u_int16_t, const char *));
+int	pcibios_return_code(struct pcibios_softc *, u_int16_t, const char *);
 
-void	pcibios_print_exclirq __P((struct pcibios_softc *));
-void	pcibios_print_pir_table __P((void));
+void	pcibios_print_exclirq(struct pcibios_softc *);
+void	pcibios_print_pir_table(void);
 
 #define	PCI_IRQ_TABLE_START	0xf0000
 #define	PCI_IRQ_TABLE_END	0xfffff
@@ -142,8 +142,8 @@ struct cfdriver pcibios_cd = {
 	NULL, "pcibios", DV_DULL
 };
 
-int pcibiosprobe __P((struct device *, void *, void *));
-void pcibiosattach __P((struct device *, struct device *, void *));
+int pcibiosprobe(struct device *, void *, void *);
+void pcibiosattach(struct device *, struct device *, void *);
 
 struct cfattach pcibios_ca = {
 	sizeof(struct pcibios_softc), pcibiosprobe, pcibiosattach
@@ -524,7 +524,7 @@ pci_device_foreach(sc, pc, maxbus, func)
 	struct pcibios_softc *sc;
 	pci_chipset_tag_t pc;
 	int maxbus;
-	void (*func) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t));
+	void (*func)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t);
 {
 	const struct pci_quirkdata *qd;
 	int bus, device, function, maxdevs, nfuncs;
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index b78e9afdcae..86d377f13c1 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.8 2001/10/25 19:03:49 mickey Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -104,7 +104,7 @@ struct pcibios_pir_header {
 #define	PIR_DEVFUNC_FUNCTION(devfunc)	((devfunc) & 7)
 #define	PIR_DEVFUNC_COMPOSE(dev,func)	((((dev) &0x1f) << 3) | ((func) & 7))
 
-void	pcibios_init __P((void));
+void	pcibios_init(void);
 
 extern struct pcibios_pir_header pcibios_pir_header;
 extern struct pcibios_intr_routing *pcibios_pir_table;
@@ -115,11 +115,11 @@ int pcibios_flags;
 typedef void *pciintr_icu_handle_t;
 
 struct pciintr_icu {
-	int	(*pi_getclink) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_get_intr) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_set_intr) __P((pciintr_icu_handle_t, int, int));
-	int	(*pi_get_trigger) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_set_trigger) __P((pciintr_icu_handle_t, int, int));
+	int	(*pi_getclink)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_get_intr)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_set_intr)(pciintr_icu_handle_t, int, int);
+	int	(*pi_get_trigger)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_set_trigger)(pciintr_icu_handle_t, int, int);
 };
 
 typedef const struct pciintr_icu *pciintr_icu_tag_t;
@@ -143,32 +143,32 @@ typedef const struct pciintr_icu *pciintr_icu_tag_t;
 
 #define	PCIADDR_SEARCH_IO	0
 #define	PCIADDR_SEARCH_MEM	1
-struct extent *pciaddr_search __P((int, bus_addr_t *, bus_size_t));
+struct extent *pciaddr_search(int, bus_addr_t *, bus_size_t);
 
-int  pci_intr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t));
-int  pci_bus_fixup __P((pci_chipset_tag_t, int));
-void pci_addr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, int));
+int  pci_intr_fixup(struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t);
+int  pci_bus_fixup(pci_chipset_tag_t, int);
+void pci_addr_fixup(struct pcibios_softc *, pci_chipset_tag_t, int);
 void pci_device_foreach __P((struct pcibios_softc *, pci_chipset_tag_t, int,
-    void (*) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t))));
-int  pci_intr_header_fixup __P((pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *));
-int  pci_intr_route_link __P((pci_chipset_tag_t, pci_intr_handle_t *));
-int  pci_intr_post_fixup __P((void));
+    void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)));
+int  pci_intr_header_fixup(pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *);
+int  pci_intr_route_link(pci_chipset_tag_t, pci_intr_handle_t *);
+int  pci_intr_post_fixup(void);
 
 /*
  * Init functions for our known PCI ICUs.
  */
-int	piix_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	opti82c558_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	opti82c700_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	via82c586_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	sis85c503_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	amd756_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	ali1543_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
+int	piix_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	opti82c558_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	opti82c700_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	via82c586_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	sis85c503_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	amd756_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	ali1543_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
 
diff --git a/sys/arch/i386/pci/pcic_pci_machdep.c b/sys/arch/i386/pci/pcic_pci_machdep.c
index 4f7e1bbf3ca..1861a31bfc6 100644
--- a/sys/arch/i386/pci/pcic_pci_machdep.c
+++ b/sys/arch/i386/pci/pcic_pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcic_pci_machdep.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */
+/*	$OpenBSD: pcic_pci_machdep.c,v 1.3 2002/03/14 01:26:33 millert Exp $ */
 /*	$NetBSD: pcic_pci_machdep.c,v 1.1 1998/12/20 17:53:29 nathanw Exp $	*/
 
 /*
@@ -58,7 +58,7 @@ pcic_pci_machdep_intr_est(pc)
 void *
 pcic_pci_machdep_pcic_intr_establish(sc, fct)
 	struct pcic_softc *sc;
-	int (*fct) __P((void *));
+	int (*fct)(void *);
 {
 	if (isa_intr_alloc(NULL, PCIC_CSC_INTR_IRQ_VALIDMASK & 0xffff,
 			   IST_EDGE, &(sc->irq)))
@@ -73,7 +73,7 @@ pcic_pci_machdep_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 	pcmcia_chipset_handle_t pch;
 	struct pcmcia_function *pf;
 	int ipl;
-	int (*fct) __P((void *));
+	int (*fct)(void *);
 	void *arg;
 	char *xname;
 {
diff --git a/sys/arch/i386/pci/pciide_machdep.c b/sys/arch/i386/pci/pciide_machdep.c
index fcfdc0f6d8a..072d7b6ba1f 100644
--- a/sys/arch/i386/pci/pciide_machdep.c
+++ b/sys/arch/i386/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_machdep.c,v 1.4 2001/06/25 21:42:31 csapuntz Exp $	*/
+/*	$OpenBSD: pciide_machdep.c,v 1.5 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	int irq;
diff --git a/sys/arch/i386/pci/piix.c b/sys/arch/i386/pci/piix.c
index 7d3843e6863..6aec21e7e38 100644
--- a/sys/arch/i386/pci/piix.c
+++ b/sys/arch/i386/pci/piix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piix.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: piix.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: piix.c,v 1.1 1999/11/17 01:21:20 thorpej Exp $	*/
 
 /*-
@@ -89,11 +89,11 @@
 #define	DPRINTF(arg)
 #endif
 
-int	piix_getclink __P((pciintr_icu_handle_t, int, int *));
-int	piix_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	piix_set_intr __P((pciintr_icu_handle_t, int, int));
+int	piix_getclink(pciintr_icu_handle_t, int, int *);
+int	piix_get_intr(pciintr_icu_handle_t, int, int *);
+int	piix_set_intr(pciintr_icu_handle_t, int, int);
 #ifdef PIIX_DEBUG
-void	piix_pir_dump __P((struct piix_handle *));
+void	piix_pir_dump(struct piix_handle *);
 #endif
 
 const struct pciintr_icu piix_pci_icu = {
diff --git a/sys/arch/i386/pci/piixvar.h b/sys/arch/i386/pci/piixvar.h
index a447b5942c5..a7ae9f2a33c 100644
--- a/sys/arch/i386/pci/piixvar.h
+++ b/sys/arch/i386/pci/piixvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piixvar.h,v 1.4 2000/03/28 03:38:00 mickey Exp $	*/
+/*	$OpenBSD: piixvar.h,v 1.5 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: piixvar.h,v 1.1 1999/11/17 01:21:21 thorpej Exp $	*/
 
 /*-
@@ -67,8 +67,8 @@
  * Support for the Intel PIIX PCI-ISA bridge interrupt controller.
  */
 
-int	piix_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	piix_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	piix_get_trigger(pciintr_icu_handle_t, int, int *);
+int	piix_set_trigger(pciintr_icu_handle_t, int, int);
 
 struct piix_handle {
 	bus_space_tag_t ph_iot;
diff --git a/sys/arch/i386/pci/sis85c503.c b/sys/arch/i386/pci/sis85c503.c
index 32697ccb144..8e70cb53bb2 100644
--- a/sys/arch/i386/pci/sis85c503.c
+++ b/sys/arch/i386/pci/sis85c503.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sis85c503.c,v 1.5 2001/01/25 00:07:41 mickey Exp $	*/
+/*	$OpenBSD: sis85c503.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: sis85c503.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,9 +82,9 @@
 #include <i386/pci/sis85c503reg.h>
 #include <i386/pci/piixvar.h>
 
-int	sis85c503_getclink __P((pciintr_icu_handle_t, int, int *));
-int	sis85c503_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	sis85c503_set_intr __P((pciintr_icu_handle_t, int, int));
+int	sis85c503_getclink(pciintr_icu_handle_t, int, int *);
+int	sis85c503_get_intr(pciintr_icu_handle_t, int, int *);
+int	sis85c503_set_intr(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu sis85c503_pci_icu = {
 	sis85c503_getclink,
diff --git a/sys/arch/i386/pci/via82c586.c b/sys/arch/i386/pci/via82c586.c
index 719ad6620d1..6e1137ea241 100644
--- a/sys/arch/i386/pci/via82c586.c
+++ b/sys/arch/i386/pci/via82c586.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via82c586.c,v 1.8 2001/06/08 03:18:04 mickey Exp $	*/
+/*	$OpenBSD: via82c586.c,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: via82c586.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,11 +82,11 @@
 #include <i386/pci/via82c586reg.h>
 #include <i386/pci/piixvar.h>
 
-int	via82c586_getclink __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_set_intr __P((pciintr_icu_handle_t, int, int));
-int	via82c586_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	via82c586_getclink(pciintr_icu_handle_t, int, int *);
+int	via82c586_get_intr(pciintr_icu_handle_t, int, int *);
+int	via82c586_set_intr(pciintr_icu_handle_t, int, int);
+int	via82c586_get_trigger(pciintr_icu_handle_t, int, int *);
+int	via82c586_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu via82c586_pci_icu = {
 	via82c586_getclink,