Remove __P.

17 files changed, 215 insertions, 215 deletions

diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c
index 987aa37..b5e662b 100644
--- a/sys/pc98/cbus/cbus_dma.c
+++ b/sys/pc98/cbus/cbus_dma.c
@@ -97,7 +97,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);
 
 #ifdef PC98
 static caddr_t	dma_bouncebuf[4];
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 2834dca..b8b9e3f 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -109,8 +109,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
 
 /*
@@ -169,7 +169,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;
 #ifndef PC98
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
@@ -188,16 +188,16 @@ static	u_char	timer0_state;
 static 	u_char	timer1_state;
 #endif
 static	u_char	timer2_state;
-static	void	(*timer_func) __P((struct clockframe *frame)) = hardclock;
+static	void	(*timer_func)(struct clockframe *frame) = hardclock;
 #ifdef PC98
-static void rtc_serialcombit __P((int));
-static void rtc_serialcom __P((int));
-static int rtc_inb __P((void));
-static void rtc_outb __P((int));
+static void rtc_serialcombit(int);
+static void rtc_serialcom(int);
+static int rtc_inb(void);
+static void rtc_outb(int);
 #endif
 
-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 = {
@@ -304,7 +304,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/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 2834dca..b8b9e3f 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -109,8 +109,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
 
 /*
@@ -169,7 +169,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;
 #ifndef PC98
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
@@ -188,16 +188,16 @@ static	u_char	timer0_state;
 static 	u_char	timer1_state;
 #endif
 static	u_char	timer2_state;
-static	void	(*timer_func) __P((struct clockframe *frame)) = hardclock;
+static	void	(*timer_func)(struct clockframe *frame) = hardclock;
 #ifdef PC98
-static void rtc_serialcombit __P((int));
-static void rtc_serialcom __P((int));
-static int rtc_inb __P((void));
-static void rtc_outb __P((int));
+static void rtc_serialcombit(int);
+static void rtc_serialcom(int);
+static int rtc_inb(void);
+static void rtc_outb(int);
 #endif
 
-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 = {
@@ -304,7 +304,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/pc98/cbus/pmc.c b/sys/pc98/cbus/pmc.c
index feafd8b..b317d70 100644
--- a/sys/pc98/cbus/pmc.c
+++ b/sys/pc98/cbus/pmc.c
@@ -51,11 +51,11 @@ struct pmc_isa_softc {
 	int			flags;
 };
 
-static int	pmc_isa_alloc_resources __P((device_t));
-static void	pmc_isa_release_resources __P((device_t));
-static int	pmc_isa_probe __P((device_t));
-static int	pmc_isa_attach __P((device_t));
-static int	pmc_isa_detach __P((device_t));
+static int	pmc_isa_alloc_resources(device_t);
+static void	pmc_isa_release_resources(device_t);
+static int	pmc_isa_probe(device_t);
+static int	pmc_isa_attach(device_t);
+static int	pmc_isa_detach(device_t);
 
 #define	PMC_ISA_PORT		0x8f0
 #define	PMC_ISA_PORTSIZE	4
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index b49506d..129214d 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -369,26 +369,26 @@ struct com_s {
 };
 
 #ifdef COM_ESP
-static	int	espattach	__P((struct com_s *com, Port_t esp_port));
+static	int	espattach(struct com_s *com, Port_t esp_port);
 #endif
 
 static	timeout_t siobusycheck;
-static	u_int	siodivisor	__P((u_long rclk, speed_t speed));
+static	u_int	siodivisor(u_long rclk, speed_t speed);
 static	timeout_t siodtrwakeup;
-static	void	comhardclose	__P((struct com_s *com));
-static	void	sioinput	__P((struct com_s *com));
-static	void	siointr1	__P((struct com_s *com));
-static	void	siointr		__P((void *arg));
-static	int	commctl		__P((struct com_s *com, int bits, int how));
-static	int	comparam	__P((struct tty *tp, struct termios *t));
-static	void	siopoll		__P((void *));
-static	void	siosettimeout	__P((void));
-static	int	siosetwater	__P((struct com_s *com, speed_t speed));
-static	void	comstart	__P((struct tty *tp));
-static	void	comstop		__P((struct tty *tp, int rw));
+static	void	comhardclose(struct com_s *com);
+static	void	sioinput(struct com_s *com);
+static	void	siointr1(struct com_s *com);
+static	void	siointr(void *arg);
+static	int	commctl(struct com_s *com, int bits, int how);
+static	int	comparam(struct tty *tp, struct termios *t);
+static	void	siopoll(void *);
+static	void	siosettimeout(void);
+static	int	siosetwater(struct com_s *com, speed_t speed);
+static	void	comstart(struct tty *tp);
+static	void	comstop(struct tty *tp, int rw);
 static	timeout_t comwakeup;
-static	void	disc_optim	__P((struct tty	*tp, struct termios *t,
-				     struct com_s *com));
+static	void	disc_optim(struct tty	*tp, struct termios *t,
+				     struct com_s *com);
 
 char		sio_driver_name[] = "sio";
 static struct	mtx sio_lock;
@@ -464,33 +464,33 @@ static	int	sysclock;
 #define IS_8251(if_type)		(!(if_type & 0x10))
 #define COM1_EXT_CLOCK			0x40000
 
-static	void	commint		__P((dev_t dev));
-static	void	com_tiocm_set	__P((struct com_s *com, int msr));
-static	void	com_tiocm_bis	__P((struct com_s *com, int msr));
-static	void	com_tiocm_bic	__P((struct com_s *com, int msr));
-static	int	com_tiocm_get	__P((struct com_s *com));
-static	int	com_tiocm_get_delta	__P((struct com_s *com));
-static	void	pc98_msrint_start	__P((dev_t dev));
-static	void	com_cflag_and_speed_set	__P((struct com_s *com, int cflag, int speed));
-static	int	pc98_ttspeedtab		__P((struct com_s *com, int speed, u_int *divisor));
-static	int	pc98_get_modem_status	__P((struct com_s *com));
+static	void	commint(dev_t dev);
+static	void	com_tiocm_set(struct com_s *com, int msr);
+static	void	com_tiocm_bis(struct com_s *com, int msr);
+static	void	com_tiocm_bic(struct com_s *com, int msr);
+static	int	com_tiocm_get(struct com_s *com);
+static	int	com_tiocm_get_delta(struct com_s *com);
+static	void	pc98_msrint_start(dev_t dev);
+static	void	com_cflag_and_speed_set(struct com_s *com, int cflag, int speed);
+static	int	pc98_ttspeedtab(struct com_s *com, int speed, u_int *divisor);
+static	int	pc98_get_modem_status(struct com_s *com);
 static	timeout_t	pc98_check_msr;
-static	void	pc98_set_baud_rate	__P((struct com_s *com, u_int count));
-static	void	pc98_i8251_reset	__P((struct com_s *com, int mode, int command));
-static	void	pc98_disable_i8251_interrupt	__P((struct com_s *com, int mod));
-static	void	pc98_enable_i8251_interrupt	__P((struct com_s *com, int mod));
-static	int	pc98_check_i8251_interrupt	__P((struct com_s *com));
-static	int	pc98_i8251_get_cmd	__P((struct com_s *com));
-static	int	pc98_i8251_get_mod	__P((struct com_s *com));
-static	void	pc98_i8251_set_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_or_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_clear_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_clear_or_cmd	__P((struct com_s *com, int clr, int x));
-static	int	pc98_check_if_type	__P((device_t dev, struct siodev *iod));
-static	int	pc98_check_8251vfast	__P((void));
-static	int	pc98_check_8251fifo	__P((void));
-static	void	pc98_check_sysclock	__P((void));
-static	void	pc98_set_ioport		__P((struct com_s *com));
+static	void	pc98_set_baud_rate(struct com_s *com, u_int count);
+static	void	pc98_i8251_reset(struct com_s *com, int mode, int command);
+static	void	pc98_disable_i8251_interrupt(struct com_s *com, int mod);
+static	void	pc98_enable_i8251_interrupt(struct com_s *com, int mod);
+static	int	pc98_check_i8251_interrupt(struct com_s *com);
+static	int	pc98_i8251_get_cmd(struct com_s *com);
+static	int	pc98_i8251_get_mod(struct com_s *com);
+static	void	pc98_i8251_set_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_or_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_clear_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_clear_or_cmd(struct com_s *com, int clr, int x);
+static	int	pc98_check_if_type(device_t dev, struct siodev *iod);
+static	int	pc98_check_8251vfast(void);
+static	int	pc98_check_8251fifo(void);
+static	void	pc98_check_sysclock(void);
+static	void	pc98_set_ioport(struct com_s *com);
 
 #define com_int_Tx_disable(com) \
 		pc98_disable_i8251_interrupt(com,IEN_Tx|IEN_TxEMP)
@@ -3929,17 +3929,17 @@ struct siocnstate {
 };
 
 #ifndef __alpha__
-static speed_t siocngetspeed __P((Port_t, u_long rclk));
+static speed_t siocngetspeed(Port_t, u_long rclk);
 #endif
-static void siocnclose	__P((struct siocnstate *sp, Port_t iobase));
-static void siocnopen	__P((struct siocnstate *sp, Port_t iobase, int speed));
-static void siocntxwait	__P((Port_t iobase));
+static void siocnclose(struct siocnstate *sp, Port_t iobase);
+static void siocnopen(struct siocnstate *sp, Port_t iobase, int speed);
+static void siocntxwait(Port_t iobase);
 
 #ifdef __alpha__
-int siocnattach __P((int port, int speed));
-int siogdbattach __P((int port, int speed));
-int siogdbgetc __P((void));
-void siogdbputc __P((int c));
+int siocnattach(int port, int speed);
+int siogdbattach(int port, int speed);
+int siogdbgetc(void);
+void siogdbputc(int c);
 #else
 static cn_probe_t siocnprobe;
 static cn_init_t siocninit;
diff --git a/sys/pc98/cbus/sio_cbus.c b/sys/pc98/cbus/sio_cbus.c
index fabee70..bfcfcc3 100644
--- a/sys/pc98/cbus/sio_cbus.c
+++ b/sys/pc98/cbus/sio_cbus.c
@@ -42,8 +42,8 @@
 
 #include <isa/isavar.h>
 
-static	int	sio_isa_attach	__P((device_t dev));
-static	int	sio_isa_probe	__P((device_t dev));
+static	int	sio_isa_attach(device_t dev);
+static	int	sio_isa_probe(device_t dev);
 
 static device_method_t sio_isa_methods[] = {
 	/* Device interface */
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 2834dca..b8b9e3f 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -109,8 +109,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
 
 /*
@@ -169,7 +169,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;
 #ifndef PC98
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
@@ -188,16 +188,16 @@ static	u_char	timer0_state;
 static 	u_char	timer1_state;
 #endif
 static	u_char	timer2_state;
-static	void	(*timer_func) __P((struct clockframe *frame)) = hardclock;
+static	void	(*timer_func)(struct clockframe *frame) = hardclock;
 #ifdef PC98
-static void rtc_serialcombit __P((int));
-static void rtc_serialcom __P((int));
-static int rtc_inb __P((void));
-static void rtc_outb __P((int));
+static void rtc_serialcombit(int);
+static void rtc_serialcom(int);
+static int rtc_inb(void);
+static void rtc_outb(int);
 #endif
 
-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 = {
@@ -304,7 +304,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/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 6326576..51228dc 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -72,25 +72,25 @@ static struct dos_partition historical_bogus_partition_table[NDOSPART] = {
 };
 #endif
 
-static int check_part __P((char *sname, struct dos_partition *dp,
+static int check_part(char *sname, struct dos_partition *dp,
 			   u_long offset, int nsectors, int ntracks,
-			   u_long mbr_offset));
+			   u_long mbr_offset);
 #ifndef PC98
-static void mbr_extended __P((dev_t dev, struct disklabel *lp,
+static void mbr_extended(dev_t dev, struct disklabel *lp,
 			      struct diskslices *ssp, u_long ext_offset,
 			      u_long ext_size, u_long base_ext_offset,
 			      int nsectors, int ntracks, u_long mbr_offset,
-			      int level));
+			      int level);
 #endif
-static int mbr_setslice __P((char *sname, struct disklabel *lp,
+static int mbr_setslice(char *sname, struct disklabel *lp,
 			     struct diskslice *sp, struct dos_partition *dp,
-			     u_long br_offset));
+			     u_long br_offset);
 
 #ifdef PC98
 #define DPBLKNO(cyl,hd,sect) ((cyl)*(lp->d_secpercyl))
 #if	NCOMPAT_ATDISK > 0
-int     atcompat_dsinit __P((dev_t dev,
-		 struct disklabel *lp, struct diskslices **sspp));
+int     atcompat_dsinit(dev_t dev,
+		 struct disklabel *lp, struct diskslices **sspp);
 #endif
 #endif
 
diff --git a/sys/pc98/pc98/isa_dma.c b/sys/pc98/pc98/isa_dma.c
index 987aa37..b5e662b 100644
--- a/sys/pc98/pc98/isa_dma.c
+++ b/sys/pc98/pc98/isa_dma.c
@@ -97,7 +97,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);
 
 #ifdef PC98
 static caddr_t	dma_bouncebuf[4];
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index f1b85de..b8fef80 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -78,13 +78,13 @@ typedef struct mse_softc {
 	bus_space_tag_t	sc_iot;
 	bus_space_handle_t sc_ioh;
 	void		*sc_ih;
-	void		(*sc_enablemouse) __P((bus_space_tag_t t,
-					       bus_space_handle_t h));
-	void		(*sc_disablemouse) __P((bus_space_tag_t t,
-						bus_space_handle_t h));
-	void		(*sc_getmouse) __P((bus_space_tag_t t,
+	void		(*sc_enablemouse)(bus_space_tag_t t,
+					       bus_space_handle_t h);
+	void		(*sc_disablemouse)(bus_space_tag_t t,
+						bus_space_handle_t h);
+	void		(*sc_getmouse)(bus_space_tag_t t,
 					    bus_space_handle_t h,
-					    int *dx, int *dy, int *but));
+					    int *dx, int *dy, int *but);
 	int		sc_deltax;
 	int		sc_deltay;
 	int		sc_obuttons;
@@ -102,9 +102,9 @@ typedef struct mse_softc {
 
 static	devclass_t	mse_devclass;
 
-static	int		mse_probe __P((device_t dev));
-static	int		mse_attach __P((device_t dev));
-static	int		mse_detach __P((device_t dev));
+static	int		mse_probe(device_t dev);
+static	int		mse_attach(device_t dev);
+static	int		mse_detach(device_t dev);
 
 static	device_method_t	mse_methods[] = {
 	DEVMETHOD(device_probe,		mse_probe),
@@ -154,7 +154,7 @@ static struct cdevsw mse_cdevsw = {
 	/* flags */	0,
 };
 
-static	void		mseintr __P((void *));
+static	void		mseintr(void *);
 static	timeout_t	msetimeout;
 
 /* Flags */
@@ -201,14 +201,14 @@ static	timeout_t	msetimeout;
 
 static	bus_addr_t	mse_port[] = {0, 2, 4, 6};
 
-static	int		mse_probe98m __P((device_t dev, mse_softc_t *sc));
-static	void		mse_disable98m __P((bus_space_tag_t t,
-					    bus_space_handle_t h));
-static	void		mse_get98m __P((bus_space_tag_t t,
+static	int		mse_probe98m(device_t dev, mse_softc_t *sc);
+static	void		mse_disable98m(bus_space_tag_t t,
+					    bus_space_handle_t h);
+static	void		mse_get98m(bus_space_tag_t t,
 					bus_space_handle_t h,
-					int *dx, int *dy, int *but));
-static	void		mse_enable98m __P((bus_space_tag_t t,
-					   bus_space_handle_t h));
+					int *dx, int *dy, int *but);
+static	void		mse_enable98m(bus_space_tag_t t,
+					   bus_space_handle_t h);
 #else
 /*
  * Logitech bus mouse definitions
@@ -247,14 +247,14 @@ static	void		mse_enable98m __P((bus_space_tag_t t,
 #define	MSE_DISINTR	0x10
 #define MSE_INTREN	0x00
 
-static	int		mse_probelogi __P((device_t dev, mse_softc_t *sc));
-static	void		mse_disablelogi __P((bus_space_tag_t t,
-					     bus_space_handle_t h));
-static	void		mse_getlogi __P((bus_space_tag_t t,
+static	int		mse_probelogi(device_t dev, mse_softc_t *sc);
+static	void		mse_disablelogi(bus_space_tag_t t,
+					     bus_space_handle_t h);
+static	void		mse_getlogi(bus_space_tag_t t,
 					 bus_space_handle_t h,
-					 int *dx, int *dy, int *but));
-static	void		mse_enablelogi __P((bus_space_tag_t t,
-					    bus_space_handle_t h));
+					 int *dx, int *dy, int *but);
+static	void		mse_enablelogi(bus_space_tag_t t,
+					    bus_space_handle_t h);
 
 /*
  * ATI Inport mouse definitions
@@ -267,14 +267,14 @@ static	void		mse_enablelogi __P((bus_space_tag_t t,
 #define	MSE_INPORT_HOLD		0x20
 #define	MSE_INPORT_INTREN	0x09
 
-static	int		mse_probeati __P((device_t dev, mse_softc_t *sc));
-static	void		mse_enableati __P((bus_space_tag_t t,
-					   bus_space_handle_t h));
-static	void		mse_disableati __P((bus_space_tag_t t,
-					    bus_space_handle_t h));
-static	void		mse_getati __P((bus_space_tag_t t,
+static	int		mse_probeati(device_t dev, mse_softc_t *sc);
+static	void		mse_enableati(bus_space_tag_t t,
+					   bus_space_handle_t h);
+static	void		mse_disableati(bus_space_tag_t t,
+					    bus_space_handle_t h);
+static	void		mse_getati(bus_space_tag_t t,
 					bus_space_handle_t h,
-					int *dx, int *dy, int *but));
+					int *dx, int *dy, int *but);
 #endif
 
 #define	MSEPRI	(PZERO + 3)
@@ -286,14 +286,14 @@ static	void		mse_getati __P((bus_space_tag_t t,
  */
 static struct mse_types {
 	int	m_type;		/* Type of bus mouse */
-	int	(*m_probe) __P((device_t dev, mse_softc_t *sc));
+	int	(*m_probe)(device_t dev, mse_softc_t *sc);
 				/* Probe routine to test for it */
-	void	(*m_enable) __P((bus_space_tag_t t, bus_space_handle_t h));
+	void	(*m_enable)(bus_space_tag_t t, bus_space_handle_t h);
 				/* Start routine */
-	void	(*m_disable) __P((bus_space_tag_t t, bus_space_handle_t h));
+	void	(*m_disable)(bus_space_tag_t t, bus_space_handle_t h);
 				/* Disable interrupts routine */
-	void	(*m_get) __P((bus_space_tag_t t, bus_space_handle_t h,
-			      int *dx, int *dy, int *but));
+	void	(*m_get)(bus_space_tag_t t, bus_space_handle_t h,
+			      int *dx, int *dy, int *but);
 				/* and get mouse status */
 	mousehw_t   m_hw;	/* buttons iftype type model hwid */
 	mousemode_t m_mode;	/* proto rate res accel level size mask */
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index a97090b..7c97d4d 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.h
@@ -30,11 +30,11 @@
 #ifndef __PC98_PC98_PC98_MACHDEP_H__
 #define __PC98_PC98_PC98_MACHDEP_H__
 
-void	pc98_init_dmac __P((void));
-unsigned int	pc98_getmemsize __P((unsigned *, unsigned *));
+void	pc98_init_dmac(void);
+unsigned int	pc98_getmemsize(unsigned *, unsigned *);
 
 struct	ccb_calc_geometry;
-int	scsi_da_bios_params __P((struct ccb_calc_geometry *));
+int	scsi_da_bios_params(struct ccb_calc_geometry *);
 
 #define	PC98_VECTOR_SIZE			(0x400)
 #define	PC98_SYSTEM_PARAMETER_SIZE		(0x230)
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index cbeb3f9..017f3ed 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -174,9 +174,9 @@ static struct cdevsw pca_cdevsw = {
 	/* flags */	0,
 };
 
-static void pca_continue __P((void));
-static void pca_init __P((void));
-static void pca_pause __P((void));
+static void pca_continue(void);
+static void pca_init(void);
+static void pca_pause(void);
 
 static void
 conv(const unsigned char *table, unsigned char *buff, unsigned n)
diff --git a/sys/pc98/pc98/pmc.c b/sys/pc98/pc98/pmc.c
index feafd8b..b317d70 100644
--- a/sys/pc98/pc98/pmc.c
+++ b/sys/pc98/pc98/pmc.c
@@ -51,11 +51,11 @@ struct pmc_isa_softc {
 	int			flags;
 };
 
-static int	pmc_isa_alloc_resources __P((device_t));
-static void	pmc_isa_release_resources __P((device_t));
-static int	pmc_isa_probe __P((device_t));
-static int	pmc_isa_attach __P((device_t));
-static int	pmc_isa_detach __P((device_t));
+static int	pmc_isa_alloc_resources(device_t);
+static void	pmc_isa_release_resources(device_t);
+static int	pmc_isa_probe(device_t);
+static int	pmc_isa_attach(device_t);
+static int	pmc_isa_detach(device_t);
 
 #define	PMC_ISA_PORT		0x8f0
 #define	PMC_ISA_PORTSIZE	4
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index b49506d..129214d 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -369,26 +369,26 @@ struct com_s {
 };
 
 #ifdef COM_ESP
-static	int	espattach	__P((struct com_s *com, Port_t esp_port));
+static	int	espattach(struct com_s *com, Port_t esp_port);
 #endif
 
 static	timeout_t siobusycheck;
-static	u_int	siodivisor	__P((u_long rclk, speed_t speed));
+static	u_int	siodivisor(u_long rclk, speed_t speed);
 static	timeout_t siodtrwakeup;
-static	void	comhardclose	__P((struct com_s *com));
-static	void	sioinput	__P((struct com_s *com));
-static	void	siointr1	__P((struct com_s *com));
-static	void	siointr		__P((void *arg));
-static	int	commctl		__P((struct com_s *com, int bits, int how));
-static	int	comparam	__P((struct tty *tp, struct termios *t));
-static	void	siopoll		__P((void *));
-static	void	siosettimeout	__P((void));
-static	int	siosetwater	__P((struct com_s *com, speed_t speed));
-static	void	comstart	__P((struct tty *tp));
-static	void	comstop		__P((struct tty *tp, int rw));
+static	void	comhardclose(struct com_s *com);
+static	void	sioinput(struct com_s *com);
+static	void	siointr1(struct com_s *com);
+static	void	siointr(void *arg);
+static	int	commctl(struct com_s *com, int bits, int how);
+static	int	comparam(struct tty *tp, struct termios *t);
+static	void	siopoll(void *);
+static	void	siosettimeout(void);
+static	int	siosetwater(struct com_s *com, speed_t speed);
+static	void	comstart(struct tty *tp);
+static	void	comstop(struct tty *tp, int rw);
 static	timeout_t comwakeup;
-static	void	disc_optim	__P((struct tty	*tp, struct termios *t,
-				     struct com_s *com));
+static	void	disc_optim(struct tty	*tp, struct termios *t,
+				     struct com_s *com);
 
 char		sio_driver_name[] = "sio";
 static struct	mtx sio_lock;
@@ -464,33 +464,33 @@ static	int	sysclock;
 #define IS_8251(if_type)		(!(if_type & 0x10))
 #define COM1_EXT_CLOCK			0x40000
 
-static	void	commint		__P((dev_t dev));
-static	void	com_tiocm_set	__P((struct com_s *com, int msr));
-static	void	com_tiocm_bis	__P((struct com_s *com, int msr));
-static	void	com_tiocm_bic	__P((struct com_s *com, int msr));
-static	int	com_tiocm_get	__P((struct com_s *com));
-static	int	com_tiocm_get_delta	__P((struct com_s *com));
-static	void	pc98_msrint_start	__P((dev_t dev));
-static	void	com_cflag_and_speed_set	__P((struct com_s *com, int cflag, int speed));
-static	int	pc98_ttspeedtab		__P((struct com_s *com, int speed, u_int *divisor));
-static	int	pc98_get_modem_status	__P((struct com_s *com));
+static	void	commint(dev_t dev);
+static	void	com_tiocm_set(struct com_s *com, int msr);
+static	void	com_tiocm_bis(struct com_s *com, int msr);
+static	void	com_tiocm_bic(struct com_s *com, int msr);
+static	int	com_tiocm_get(struct com_s *com);
+static	int	com_tiocm_get_delta(struct com_s *com);
+static	void	pc98_msrint_start(dev_t dev);
+static	void	com_cflag_and_speed_set(struct com_s *com, int cflag, int speed);
+static	int	pc98_ttspeedtab(struct com_s *com, int speed, u_int *divisor);
+static	int	pc98_get_modem_status(struct com_s *com);
 static	timeout_t	pc98_check_msr;
-static	void	pc98_set_baud_rate	__P((struct com_s *com, u_int count));
-static	void	pc98_i8251_reset	__P((struct com_s *com, int mode, int command));
-static	void	pc98_disable_i8251_interrupt	__P((struct com_s *com, int mod));
-static	void	pc98_enable_i8251_interrupt	__P((struct com_s *com, int mod));
-static	int	pc98_check_i8251_interrupt	__P((struct com_s *com));
-static	int	pc98_i8251_get_cmd	__P((struct com_s *com));
-static	int	pc98_i8251_get_mod	__P((struct com_s *com));
-static	void	pc98_i8251_set_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_or_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_clear_cmd	__P((struct com_s *com, int x));
-static	void	pc98_i8251_clear_or_cmd	__P((struct com_s *com, int clr, int x));
-static	int	pc98_check_if_type	__P((device_t dev, struct siodev *iod));
-static	int	pc98_check_8251vfast	__P((void));
-static	int	pc98_check_8251fifo	__P((void));
-static	void	pc98_check_sysclock	__P((void));
-static	void	pc98_set_ioport		__P((struct com_s *com));
+static	void	pc98_set_baud_rate(struct com_s *com, u_int count);
+static	void	pc98_i8251_reset(struct com_s *com, int mode, int command);
+static	void	pc98_disable_i8251_interrupt(struct com_s *com, int mod);
+static	void	pc98_enable_i8251_interrupt(struct com_s *com, int mod);
+static	int	pc98_check_i8251_interrupt(struct com_s *com);
+static	int	pc98_i8251_get_cmd(struct com_s *com);
+static	int	pc98_i8251_get_mod(struct com_s *com);
+static	void	pc98_i8251_set_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_or_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_clear_cmd(struct com_s *com, int x);
+static	void	pc98_i8251_clear_or_cmd(struct com_s *com, int clr, int x);
+static	int	pc98_check_if_type(device_t dev, struct siodev *iod);
+static	int	pc98_check_8251vfast(void);
+static	int	pc98_check_8251fifo(void);
+static	void	pc98_check_sysclock(void);
+static	void	pc98_set_ioport(struct com_s *com);
 
 #define com_int_Tx_disable(com) \
 		pc98_disable_i8251_interrupt(com,IEN_Tx|IEN_TxEMP)
@@ -3929,17 +3929,17 @@ struct siocnstate {
 };
 
 #ifndef __alpha__
-static speed_t siocngetspeed __P((Port_t, u_long rclk));
+static speed_t siocngetspeed(Port_t, u_long rclk);
 #endif
-static void siocnclose	__P((struct siocnstate *sp, Port_t iobase));
-static void siocnopen	__P((struct siocnstate *sp, Port_t iobase, int speed));
-static void siocntxwait	__P((Port_t iobase));
+static void siocnclose(struct siocnstate *sp, Port_t iobase);
+static void siocnopen(struct siocnstate *sp, Port_t iobase, int speed);
+static void siocntxwait(Port_t iobase);
 
 #ifdef __alpha__
-int siocnattach __P((int port, int speed));
-int siogdbattach __P((int port, int speed));
-int siogdbgetc __P((void));
-void siogdbputc __P((int c));
+int siocnattach(int port, int speed);
+int siogdbattach(int port, int speed);
+int siogdbgetc(void);
+void siogdbputc(int c);
 #else
 static cn_probe_t siocnprobe;
 static cn_init_t siocninit;
diff --git a/sys/pc98/pc98/sio_cbus.c b/sys/pc98/pc98/sio_cbus.c
index fabee70..bfcfcc3 100644
--- a/sys/pc98/pc98/sio_cbus.c
+++ b/sys/pc98/pc98/sio_cbus.c
@@ -42,8 +42,8 @@
 
 #include <isa/isavar.h>
 
-static	int	sio_isa_attach	__P((device_t dev));
-static	int	sio_isa_probe	__P((device_t dev));
+static	int	sio_isa_attach(device_t dev);
+static	int	sio_isa_probe(device_t dev);
 
 static device_method_t sio_isa_methods[] = {
 	/* Device interface */
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 9393ad2..f999909 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -82,12 +82,12 @@ static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
 #define SPKRPRI PSOCK
 static char endtone, endrest;
 
-static void tone __P((unsigned int thz, unsigned int ticks));
-static void rest __P((int ticks));
-static void playinit __P((void));
-static void playtone __P((int pitch, int value, int sustain));
-static int abs __P((int n));
-static void playstring __P((char *cp, size_t slen));
+static void tone(unsigned int thz, unsigned int ticks);
+static void rest(int ticks);
+static void playinit(void);
+static void playtone(int pitch, int value, int sustain);
+static int abs(int n);
+static void playstring(char *cp, size_t slen);
 
 /* emit tone of frequency thz for given number of ticks */
 static void
diff --git a/sys/pc98/pc98/wdreg.h b/sys/pc98/pc98/wdreg.h
index 7dc9a87..4100b5c 100644
--- a/sys/pc98/pc98/wdreg.h
+++ b/sys/pc98/pc98/wdreg.h
@@ -262,26 +262,26 @@ struct wdparams {
  */
 struct wddma {
 	void	*(*wdd_candma)		/* returns a cookie if PCI */
-		__P((int iobase_wd, int ctlr, int unit));
+		(int iobase_wd, int ctlr, int unit);
 	int	(*wdd_dmaverify)	/* verify that request is DMA-able */
-		__P((void *cookie, char *vaddr, u_long len, int direction));
+		(void *cookie, char *vaddr, u_long len, int direction);
 	int	(*wdd_dmaprep)		/* prepare DMA hardware */
-		__P((void *cookie, char *vaddr, u_long len, int direction));
+		(void *cookie, char *vaddr, u_long len, int direction);
 	void	(*wdd_dmastart)		/* begin DMA transfer */
-		__P((void *cookie));
+		(void *cookie);
 	int	(*wdd_dmadone)		/* DMA transfer completed */
-		__P((void *cookie));
+		(void *cookie);
 	int	(*wdd_dmastatus)	/* return status of DMA */
-		__P((void *cookie));
+		(void *cookie);
 	int	(*wdd_dmainit)		/* initialize controller and drive */
-		__P((void *cookie, 
+		(void *cookie, 
 		     struct wdparams *wp, 
-		     int(wdcmd)__P((int mode, void *wdinfo)),
-		     void *wdinfo));
+		     int(wdcmd)(int mode, void *wdinfo),
+		     void *wdinfo);
 	int	(*wdd_iobase)		/* returns iobase address */
-		__P((void *cookie));
+		(void *cookie);
 	int	(*wdd_altiobase)	/* returns altiobase address */
-		__P((void *cookie));
+		(void *cookie);
 };
 
 /* logical status bits returned by wdd_dmastatus */
@@ -315,6 +315,6 @@ void	wdc_pci(int quirks);
 
 extern struct wddma wddma[];
 
-void	wdintr __P((void *unit));
+void	wdintr(void *unit);
 
 #endif /* _KERNEL */