Remove __P.

8 files changed, 72 insertions, 73 deletions

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 07bd2f5..d3d6a01 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -118,20 +118,20 @@
 
 #else	/* not __GNUC__ */
 
-void	fldcw		__P((caddr_t addr));
-void	fnclex		__P((void));
-void	fninit		__P((void));
-void	fnsave		__P((caddr_t addr));
-void	fnstcw		__P((caddr_t addr));
-void	fnstsw		__P((caddr_t addr));
-void	fp_divide_by_0	__P((void));
-void	frstor		__P((caddr_t addr));
+void	fldcw		(caddr_t addr);
+void	fnclex		(void);
+void	fninit		(void);
+void	fnsave		(caddr_t addr);
+void	fnstcw		(caddr_t addr);
+void	fnstsw		(caddr_t addr);
+void	fp_divide_by_0	(void);
+void	frstor		(caddr_t addr);
 #ifdef CPU_ENABLE_SSE
-void	fxsave		__P((caddr_t addr));
-void	fxrstor		__P((caddr_t addr));
+void	fxsave		(caddr_t addr);
+void	fxrstor		(caddr_t addr);
 #endif
-void	start_emulating	__P((void));
-void	stop_emulating	__P((void));
+void	start_emulating	(void);
+void	stop_emulating	(void);
 
 #endif	/* __GNUC__ */
 
@@ -159,17 +159,17 @@ void	stop_emulating	__P((void));
 
 typedef u_char bool_t;
 
-static	int	npx_attach	__P((device_t dev));
-static	void	npx_identify	__P((driver_t *driver, device_t parent));
+static	int	npx_attach	(device_t dev);
+static	void	npx_identify	(driver_t *driver, device_t parent);
 #ifndef SMP
-static	void	npx_intr	__P((void *));
+static	void	npx_intr	(void *);
 #endif
-static	int	npx_probe	__P((device_t dev));
-static	void	fpusave		__P((union savefpu *));
-static	void	fpurstor	__P((union savefpu *));
+static	int	npx_probe	(device_t dev);
+static	void	fpusave		(union savefpu *);
+static	void	fpurstor	(union savefpu *);
 #ifdef I586_CPU_XXX
-static	long	timezero	__P((const char *funcname,
-				     void (*func)(void *buf, size_t len)));
+static	long	timezero	(const char *funcname,
+				     void (*func)(void *buf, size_t len));
 #endif /* I586_CPU */
 
 int	hw_float;		/* XXX currently just alias for npx_exists */
@@ -905,7 +905,7 @@ fpurstor(addr)
 static long
 timezero(funcname, func)
 	const char *funcname;
-	void (*func) __P((void *buf, size_t len));
+	void (*func)(void *buf, size_t len);
 
 {
 	void *buf;
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index ae56051..49516028 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -99,8 +99,8 @@
 #include <i386/isa/intr_machdep.h>
 /* The interrupt triggered by the 8254 (timer) chip */
 int apic_8254_intr;
-static u_long read_intr_count __P((int vec));
-static void setup_8254_mixed_mode __P((void));
+static u_long read_intr_count(int vec);
+static void setup_8254_mixed_mode(void);
 #endif
 
 /*
@@ -155,7 +155,7 @@ static	int	i8254_ticked;
  * timer0_state == 0 case.  We should use inthand_add()/inthand_remove()
  * to switch between clkintr() and a slightly different timerintr().
  */
-static	void	(*new_function) __P((struct clockframe *frame));
+static	void	(*new_function)(struct clockframe *frame);
 static	u_int	new_rate;
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
 static	u_char	rtc_statusb = RTCSB_24HR | RTCSB_PINTR;
@@ -169,10 +169,10 @@ static	u_int	timer0_prescaler_count;
 
 static	u_char	timer0_state;
 static	u_char	timer2_state;
-static	void	(*timer_func) __P((struct clockframe *frame)) = hardclock;
+static	void	(*timer_func)(struct clockframe *frame) = hardclock;
 
-static	unsigned i8254_get_timecount __P((struct timecounter *tc));
-static	unsigned tsc_get_timecount __P((struct timecounter *tc));
+static	unsigned i8254_get_timecount(struct timecounter *tc);
+static	unsigned tsc_get_timecount(struct timecounter *tc);
 static	void	set_timer_freq(u_int freq, int intr_freq);
 
 static struct timecounter tsc_timecounter = {
@@ -279,7 +279,7 @@ clkintr(struct clockframe frame)
  * The acquire and release functions must be called at ipl >= splclock().
  */
 int
-acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
+acquire_timer0(int rate, void (*function)(struct clockframe *frame))
 {
 	static int old_rate;
 
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index ae56051..49516028 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -99,8 +99,8 @@
 #include <i386/isa/intr_machdep.h>
 /* The interrupt triggered by the 8254 (timer) chip */
 int apic_8254_intr;
-static u_long read_intr_count __P((int vec));
-static void setup_8254_mixed_mode __P((void));
+static u_long read_intr_count(int vec);
+static void setup_8254_mixed_mode(void);
 #endif
 
 /*
@@ -155,7 +155,7 @@ static	int	i8254_ticked;
  * timer0_state == 0 case.  We should use inthand_add()/inthand_remove()
  * to switch between clkintr() and a slightly different timerintr().
  */
-static	void	(*new_function) __P((struct clockframe *frame));
+static	void	(*new_function)(struct clockframe *frame);
 static	u_int	new_rate;
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
 static	u_char	rtc_statusb = RTCSB_24HR | RTCSB_PINTR;
@@ -169,10 +169,10 @@ static	u_int	timer0_prescaler_count;
 
 static	u_char	timer0_state;
 static	u_char	timer2_state;
-static	void	(*timer_func) __P((struct clockframe *frame)) = hardclock;
+static	void	(*timer_func)(struct clockframe *frame) = hardclock;
 
-static	unsigned i8254_get_timecount __P((struct timecounter *tc));
-static	unsigned tsc_get_timecount __P((struct timecounter *tc));
+static	unsigned i8254_get_timecount(struct timecounter *tc);
+static	unsigned tsc_get_timecount(struct timecounter *tc);
 static	void	set_timer_freq(u_int freq, int intr_freq);
 
 static struct timecounter tsc_timecounter = {
@@ -279,7 +279,7 @@ clkintr(struct clockframe frame)
  * The acquire and release functions must be called at ipl >= splclock().
  */
 int
-acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
+acquire_timer0(int rate, void (*function)(struct clockframe *frame))
 {
 	static int old_rate;
 
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index 4035ac6..36d532a 100644
--- a/sys/amd64/isa/icu.h
+++ b/sys/amd64/isa/icu.h
@@ -55,8 +55,8 @@
  *	DO NOT access imen directly, use INTREN()/INTRDIS().
  */
 
-void	INTREN			__P((u_int));
-void	INTRDIS			__P((u_int));
+void	INTREN			(u_int);
+void	INTRDIS			(u_int);
 
 #ifdef APIC_IO
 extern	unsigned apic_imen;	/* APIC interrupt mask enable */
diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h
index 1726635..d674630 100644
--- a/sys/amd64/isa/intr_machdep.h
+++ b/sys/amd64/isa/intr_machdep.h
@@ -139,7 +139,7 @@
 /*
  * Type of the first (asm) part of an interrupt handler.
  */
-typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
+typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
 
 #define	IDTVEC(name)	__CONCAT(X,name)
 
@@ -213,11 +213,10 @@ inthand_t
 
 #define	NR_INTRNAMES	(1 + ICU_LEN + 2 * ICU_LEN)
 
-void	isa_defaultirq __P((void));
-int	isa_nmi __P((int cd));
-int	icu_setup __P((int intr, driver_intr_t *func, void *arg, 
-		       int flags));
-int	icu_unset __P((int intr, driver_intr_t *handler));
+void	isa_defaultirq(void);
+int	isa_nmi(int cd);
+int	icu_setup(int intr, driver_intr_t *func, void *arg, int flags);
+int	icu_unset(int intr, driver_intr_t *handler);
 void	icu_reinit(void);
 
 /*
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index 38ab398..36bd2e5 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -79,7 +79,7 @@
 #define	DMA2_MODE	(IO_DMA2 + 2*11)	/* mode register */
 #define	DMA2_FFC	(IO_DMA2 + 2*12)	/* clear first/last FF */
 
-static int isa_dmarangecheck __P((caddr_t va, u_int length, int chan));
+static int isa_dmarangecheck(caddr_t va, u_int length, int chan);
 
 static caddr_t	dma_bouncebuf[8];
 static u_int	dma_bouncebufsize[8];
diff --git a/sys/amd64/isa/isa_dma.h b/sys/amd64/isa/isa_dma.h
index 60a69bf..a4ac817 100644
--- a/sys/amd64/isa/isa_dma.h
+++ b/sys/amd64/isa/isa_dma.h
@@ -43,14 +43,14 @@
 #define ISADMA_WRITE	0
 #define ISADMA_RAW	0x00080000
 
-void	isa_dmacascade __P((int chan));
-void	isa_dmadone __P((int flags, caddr_t addr, int nbytes, int chan));
-void	isa_dmainit __P((int chan, u_int bouncebufsize));
-void	isa_dmastart __P((int flags, caddr_t addr, u_int nbytes, int chan));
-int	isa_dma_acquire __P((int chan));
-void	isa_dma_release __P((int chan));
-int	isa_dmastatus __P((int chan));
-int	isa_dmastop __P((int chan));
+void	isa_dmacascade(int chan);
+void	isa_dmadone(int flags, caddr_t addr, int nbytes, int chan);
+void	isa_dmainit(int chan, u_int bouncebufsize);
+void	isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan);
+int	isa_dma_acquire(int chan);
+void	isa_dma_release(int chan);
+int	isa_dmastatus(int chan);
+int	isa_dmastop(int chan);
 #endif
 
 #endif /* !_I386_ISA_ISA_DMA_H_ */
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 07bd2f5..d3d6a01 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -118,20 +118,20 @@
 
 #else	/* not __GNUC__ */
 
-void	fldcw		__P((caddr_t addr));
-void	fnclex		__P((void));
-void	fninit		__P((void));
-void	fnsave		__P((caddr_t addr));
-void	fnstcw		__P((caddr_t addr));
-void	fnstsw		__P((caddr_t addr));
-void	fp_divide_by_0	__P((void));
-void	frstor		__P((caddr_t addr));
+void	fldcw		(caddr_t addr);
+void	fnclex		(void);
+void	fninit		(void);
+void	fnsave		(caddr_t addr);
+void	fnstcw		(caddr_t addr);
+void	fnstsw		(caddr_t addr);
+void	fp_divide_by_0	(void);
+void	frstor		(caddr_t addr);
 #ifdef CPU_ENABLE_SSE
-void	fxsave		__P((caddr_t addr));
-void	fxrstor		__P((caddr_t addr));
+void	fxsave		(caddr_t addr);
+void	fxrstor		(caddr_t addr);
 #endif
-void	start_emulating	__P((void));
-void	stop_emulating	__P((void));
+void	start_emulating	(void);
+void	stop_emulating	(void);
 
 #endif	/* __GNUC__ */
 
@@ -159,17 +159,17 @@ void	stop_emulating	__P((void));
 
 typedef u_char bool_t;
 
-static	int	npx_attach	__P((device_t dev));
-static	void	npx_identify	__P((driver_t *driver, device_t parent));
+static	int	npx_attach	(device_t dev);
+static	void	npx_identify	(driver_t *driver, device_t parent);
 #ifndef SMP
-static	void	npx_intr	__P((void *));
+static	void	npx_intr	(void *);
 #endif
-static	int	npx_probe	__P((device_t dev));
-static	void	fpusave		__P((union savefpu *));
-static	void	fpurstor	__P((union savefpu *));
+static	int	npx_probe	(device_t dev);
+static	void	fpusave		(union savefpu *);
+static	void	fpurstor	(union savefpu *);
 #ifdef I586_CPU_XXX
-static	long	timezero	__P((const char *funcname,
-				     void (*func)(void *buf, size_t len)));
+static	long	timezero	(const char *funcname,
+				     void (*func)(void *buf, size_t len));
 #endif /* I586_CPU */
 
 int	hw_float;		/* XXX currently just alias for npx_exists */
@@ -905,7 +905,7 @@ fpurstor(addr)
 static long
 timezero(funcname, func)
 	const char *funcname;
-	void (*func) __P((void *buf, size_t len));
+	void (*func)(void *buf, size_t len);
 
 {
 	void *buf;