Remove __P.

5 files changed, 99 insertions, 99 deletions

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 992dcef..ee164d8 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -344,38 +344,38 @@ struct com_s {
 };
 
 /* PCI driver entry point. */
-int	cyattach_common		__P((cy_addr cy_iobase, int cy_align));
+int	cyattach_common		(cy_addr cy_iobase, int cy_align);
 ointhand2_t	siointr;
 
-static	int	cy_units	__P((cy_addr cy_iobase, int cy_align));
-static	int	sioattach	__P((struct isa_device *dev));
-static	void	cd1400_channel_cmd __P((struct com_s *com, int cmd));
-static	void	cd1400_channel_cmd_wait __P((struct com_s *com));
-static	void	cd_etc		__P((struct com_s *com, int etc));
-static	int	cd_getreg	__P((struct com_s *com, int reg));
-static	void	cd_setreg	__P((struct com_s *com, int reg, int val));
+static	int	cy_units	(cy_addr cy_iobase, int cy_align);
+static	int	sioattach	(struct isa_device *dev);
+static	void	cd1400_channel_cmd(struct com_s *com, int cmd);
+static	void	cd1400_channel_cmd_wait(struct com_s *com);
+static	void	cd_etc		(struct com_s *com, int etc);
+static	int	cd_getreg	(struct com_s *com, int reg);
+static	void	cd_setreg	(struct com_s *com, int reg, int val);
 static	timeout_t siodtrwakeup;
-static	void	comhardclose	__P((struct com_s *com));
-static	void	sioinput	__P((struct com_s *com));
+static	void	comhardclose	(struct com_s *com);
+static	void	sioinput	(struct com_s *com);
 #if 0
-static	void	siointr1	__P((struct com_s *com));
-#endif
-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 *arg));
-static	int	sioprobe	__P((struct isa_device *dev));
-static	void	siosettimeout	__P((void));
-static	int	siosetwater	__P((struct com_s *com, speed_t speed));
-static	int	comspeed	__P((speed_t speed, u_long cy_clock,
-				     int *prescaler_io));
-static	void	comstart	__P((struct tty *tp));
-static	void	comstop		__P((struct tty *tp, int rw));
+static	void	siointr1	(struct com_s *com);
+#endif
+static	int	commctl		(struct com_s *com, int bits, int how);
+static	int	comparam	(struct tty *tp, struct termios *t);
+static	void	siopoll		(void *arg);
+static	int	sioprobe	(struct isa_device *dev);
+static	void	siosettimeout	(void);
+static	int	siosetwater	(struct com_s *com, speed_t speed);
+static	int	comspeed	(speed_t speed, u_long cy_clock,
+				     int *prescaler_io);
+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);
 
 #ifdef CyDebug
-void	cystatus	__P((int unit));
+void	cystatus	(int unit);
 #endif
 
 static char driver_name[] = "cy";
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 992dcef..ee164d8 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -344,38 +344,38 @@ struct com_s {
 };
 
 /* PCI driver entry point. */
-int	cyattach_common		__P((cy_addr cy_iobase, int cy_align));
+int	cyattach_common		(cy_addr cy_iobase, int cy_align);
 ointhand2_t	siointr;
 
-static	int	cy_units	__P((cy_addr cy_iobase, int cy_align));
-static	int	sioattach	__P((struct isa_device *dev));
-static	void	cd1400_channel_cmd __P((struct com_s *com, int cmd));
-static	void	cd1400_channel_cmd_wait __P((struct com_s *com));
-static	void	cd_etc		__P((struct com_s *com, int etc));
-static	int	cd_getreg	__P((struct com_s *com, int reg));
-static	void	cd_setreg	__P((struct com_s *com, int reg, int val));
+static	int	cy_units	(cy_addr cy_iobase, int cy_align);
+static	int	sioattach	(struct isa_device *dev);
+static	void	cd1400_channel_cmd(struct com_s *com, int cmd);
+static	void	cd1400_channel_cmd_wait(struct com_s *com);
+static	void	cd_etc		(struct com_s *com, int etc);
+static	int	cd_getreg	(struct com_s *com, int reg);
+static	void	cd_setreg	(struct com_s *com, int reg, int val);
 static	timeout_t siodtrwakeup;
-static	void	comhardclose	__P((struct com_s *com));
-static	void	sioinput	__P((struct com_s *com));
+static	void	comhardclose	(struct com_s *com);
+static	void	sioinput	(struct com_s *com);
 #if 0
-static	void	siointr1	__P((struct com_s *com));
-#endif
-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 *arg));
-static	int	sioprobe	__P((struct isa_device *dev));
-static	void	siosettimeout	__P((void));
-static	int	siosetwater	__P((struct com_s *com, speed_t speed));
-static	int	comspeed	__P((speed_t speed, u_long cy_clock,
-				     int *prescaler_io));
-static	void	comstart	__P((struct tty *tp));
-static	void	comstop		__P((struct tty *tp, int rw));
+static	void	siointr1	(struct com_s *com);
+#endif
+static	int	commctl		(struct com_s *com, int bits, int how);
+static	int	comparam	(struct tty *tp, struct termios *t);
+static	void	siopoll		(void *arg);
+static	int	sioprobe	(struct isa_device *dev);
+static	void	siosettimeout	(void);
+static	int	siosetwater	(struct com_s *com, speed_t speed);
+static	int	comspeed	(speed_t speed, u_long cy_clock,
+				     int *prescaler_io);
+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);
 
 #ifdef CyDebug
-void	cystatus	__P((int unit));
+void	cystatus	(int unit);
 #endif
 
 static char driver_name[] = "cy";
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 915bc3f..258847b 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -79,13 +79,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;
@@ -103,9 +103,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),
@@ -155,7 +155,7 @@ static struct cdevsw mse_cdevsw = {
 	/* flags */	0,
 };
 
-static	void		mseintr __P((void *));
+static	void		mseintr(void *);
 static	timeout_t	msetimeout;
 
 /* Flags */
@@ -214,14 +214,14 @@ static	timeout_t	msetimeout;
 #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
@@ -234,14 +234,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);
 
 #define	MSEPRI	(PZERO + 3)
 
@@ -252,14 +252,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/dev/rc/rc.c b/sys/dev/rc/rc.c
index d9bd2ad..63b608f 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -54,8 +54,8 @@
 #include <i386/isa/rcreg.h>
 
 /* Prototypes */
-static int     rcprobe         __P((struct isa_device *));
-static int     rcattach        __P((struct isa_device *));
+static int     rcprobe(struct isa_device *);
+static int     rcattach(struct isa_device *);
 
 #define rcin(port)      RC_IN  (nec, port)
 #define rcout(port,v)   RC_OUT (nec, port, v)
@@ -174,23 +174,23 @@ static void	*rc_ih;
 
 /* Static prototypes */
 static ointhand2_t rcintr;
-static void rc_hwreset          __P((int, int, unsigned int));
-static int  rc_test             __P((int, int));
-static void rc_discard_output   __P((struct rc_chans *));
-static void rc_hardclose        __P((struct rc_chans *));
-static int  rc_modctl           __P((struct rc_chans *, int, int));
-static void rc_start            __P((struct tty *));
-static void rc_stop              __P((struct tty *, int rw));
-static int  rc_param            __P((struct tty *, struct termios *));
-static void rcpoll		__P((void *));
-static void rc_reinit           __P((struct rc_softc *));
+static void rc_hwreset(int, int, unsigned int);
+static int  rc_test(int, int);
+static void rc_discard_output(struct rc_chans *);
+static void rc_hardclose(struct rc_chans *);
+static int  rc_modctl(struct rc_chans *, int, int);
+static void rc_start(struct tty *);
+static void rc_stop(struct tty *, int rw);
+static int  rc_param(struct tty *, struct termios *);
+static void rcpoll		(void *);
+static void rc_reinit(struct rc_softc *);
 #ifdef RCDEBUG
 static void printrcflags();
 #endif
 static timeout_t rc_dtrwakeup;
 static timeout_t rc_wakeup;
-static void disc_optim		__P((struct tty	*tp, struct termios *t,	struct rc_chans	*));
-static void rc_wait0            __P((int nec, int unit, int chan, int line));
+static void disc_optim		(struct tty	*tp, struct termios *t,	struct rc_chans	*);
+static void rc_wait0(int nec, int unit, int chan, int line);
 
 /**********************************************/
 
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index c457906..67084b6 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -68,12 +68,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