Remove __P.

6 files changed, 70 insertions, 73 deletions

diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 70da649..fc6a9d6 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -87,37 +87,35 @@
 #include <dev/snc/dp83932reg.h>
 #include <dev/snc/dp83932var.h>
 
-hide void	sncwatchdog __P((struct ifnet *));
-hide void	sncinit __P((void *));
-hide int	sncstop __P((struct snc_softc *sc));
-hide int	sncioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data));
-hide void	sncstart __P((struct ifnet *ifp));
-hide void	sncreset __P((struct snc_softc *sc));
-
-hide void	caminitialise __P((struct snc_softc *));
-hide void	camentry __P((struct snc_softc *, int, u_char *ea));
-hide void	camprogram __P((struct snc_softc *));
-hide void	initialise_tda __P((struct snc_softc *));
-hide void	initialise_rda __P((struct snc_softc *));
-hide void	initialise_rra __P((struct snc_softc *));
+hide void	sncwatchdog(struct ifnet *);
+hide void	sncinit(void *);
+hide int	sncstop(struct snc_softc *sc);
+hide int	sncioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+hide void	sncstart(struct ifnet *ifp);
+hide void	sncreset(struct snc_softc *sc);
+
+hide void	caminitialise(struct snc_softc *);
+hide void	camentry(struct snc_softc *, int, u_char *ea);
+hide void	camprogram(struct snc_softc *);
+hide void	initialise_tda(struct snc_softc *);
+hide void	initialise_rda(struct snc_softc *);
+hide void	initialise_rra(struct snc_softc *);
 #ifdef SNCDEBUG
-hide void	camdump __P((struct snc_softc *sc));
+hide void	camdump(struct snc_softc *sc);
 #endif
 
-hide void	sonictxint __P((struct snc_softc *));
-hide void	sonicrxint __P((struct snc_softc *));
+hide void	sonictxint(struct snc_softc *);
+hide void	sonicrxint(struct snc_softc *);
 
-hide u_int	sonicput __P((struct snc_softc *sc, struct mbuf *m0,
-			    int mtd_next));
-hide int	sonic_read __P((struct snc_softc *, u_int32_t, int));
-hide struct mbuf *sonic_get __P((struct snc_softc *,
-			    u_int32_t, int));
+hide u_int	sonicput(struct snc_softc *sc, struct mbuf *m0, int mtd_next);
+hide int	sonic_read(struct snc_softc *, u_int32_t, int);
+hide struct mbuf *sonic_get(struct snc_softc *, u_int32_t, int);
 
-int	snc_enable __P((struct snc_softc *));
-void	snc_disable __P((struct snc_softc *));
+int	snc_enable(struct snc_softc *);
+void	snc_disable(struct snc_softc *);
 
-int	snc_mediachange __P((struct ifnet *));
-void	snc_mediastatus __P((struct ifnet *, struct ifmediareq *));
+int	snc_mediachange(struct ifnet *);
+void	snc_mediastatus(struct ifnet *, struct ifmediareq *);
 
 #ifdef NetBSD
 #if NetBSD <= 199714
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 5de5bf0..a83b794 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -72,7 +72,7 @@
 #include <dev/snc/dp83932subr.h>
 
 integrate u_int16_t snc_nec16_select_bank
-	__P((struct snc_softc *, u_int32_t, u_int32_t));
+	(struct snc_softc *, u_int32_t, u_int32_t);
 
 /*
  * Interface exists: make available by filling in network interface
diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h
index 7bcf501..78fa636 100644
--- a/sys/dev/snc/dp83932subr.h
+++ b/sys/dev/snc/dp83932subr.h
@@ -40,39 +40,39 @@
  * and National Semiconductor NS46C46 as (64 * 16 bits) Microwire Serial EEPROM.
  */
 
-int sncsetup __P((struct snc_softc *, u_int8_t *));
+int sncsetup(struct snc_softc *, u_int8_t *);
 
-u_int8_t snc_nec16_validate_irq __P((int));
-int snc_nec16_register_irq __P((struct snc_softc *, int));
-int snc_nec16_validate_mem __P((int));
-int snc_nec16_register_mem __P((struct snc_softc *, int));
+u_int8_t snc_nec16_validate_irq(int);
+int snc_nec16_register_irq(struct snc_softc *, int);
+int snc_nec16_validate_mem(int);
+int snc_nec16_register_mem(struct snc_softc *, int);
 
-u_int16_t snc_nec16_nic_get __P((struct snc_softc *, u_int8_t));
-void snc_nec16_nic_put __P((struct snc_softc *, u_int8_t, u_int16_t));
+u_int16_t snc_nec16_nic_get(struct snc_softc *, u_int8_t);
+void snc_nec16_nic_put(struct snc_softc *, u_int8_t, u_int16_t);
 
 
 void snc_nec16_writetodesc
-	__P((struct snc_softc *, u_int32_t, u_int32_t, u_int16_t));
+	(struct snc_softc *, u_int32_t, u_int32_t, u_int16_t);
 u_int16_t snc_nec16_readfromdesc
-	__P((struct snc_softc *, u_int32_t, u_int32_t));
+	(struct snc_softc *, u_int32_t, u_int32_t);
 
-void snc_nec16_copyfrombuf __P((struct snc_softc *, void *, u_int32_t, size_t));
-void snc_nec16_copytobuf __P((struct snc_softc *, void *, u_int32_t, size_t));
-void snc_nec16_zerobuf __P((struct snc_softc *, u_int32_t, size_t));
+void snc_nec16_copyfrombuf(struct snc_softc *, void *, u_int32_t, size_t);
+void snc_nec16_copytobuf(struct snc_softc *, void *, u_int32_t, size_t);
+void snc_nec16_zerobuf(struct snc_softc *, u_int32_t, size_t);
 
 int snc_nec16_detectsubr
-	__P((bus_space_tag_t, bus_space_handle_t, bus_space_tag_t,
-		bus_space_handle_t, int, int, u_int8_t));
+	(bus_space_tag_t, bus_space_handle_t, bus_space_tag_t,
+		bus_space_handle_t, int, int, u_int8_t);
 int snc_nec16_check_memory
-	__P((bus_space_tag_t, bus_space_handle_t, bus_space_tag_t,
-		bus_space_handle_t));
+	(bus_space_tag_t, bus_space_handle_t, bus_space_tag_t,
+		bus_space_handle_t);
 
 int snc_nec16_get_enaddr
-	__P((bus_space_tag_t, bus_space_handle_t, u_int8_t *));
-u_int8_t *snc_nec16_detect_type __P((u_int8_t *));
+	(bus_space_tag_t, bus_space_handle_t, u_int8_t *);
+u_int8_t *snc_nec16_detect_type(u_int8_t *);
 void snc_nec16_read_eeprom
-	__P((bus_space_tag_t, bus_space_handle_t, u_int8_t *));
+	(bus_space_tag_t, bus_space_handle_t, u_int8_t *);
 
 #ifdef	SNCDEBUG
-void snc_nec16_dump_reg __P((bus_space_tag_t, bus_space_handle_t));
+void snc_nec16_dump_reg(bus_space_tag_t, bus_space_handle_t);
 #endif	/* SNDEBUG */
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index adcf9c8..2431bb7 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -182,9 +182,9 @@ typedef struct snc_softc {
 	 * NIC register access functions:
 	 */
 	u_int16_t	(*sc_nic_get)
-		__P((struct snc_softc *, u_int8_t));
+		(struct snc_softc *, u_int8_t);
 	void		(*sc_nic_put)
-		__P((struct snc_softc *, u_int8_t, u_int16_t));
+		(struct snc_softc *, u_int8_t, u_int16_t);
 
 	/*
 	 * Memory functions:
@@ -194,15 +194,15 @@ typedef struct snc_softc {
 	 *	zero bytes in buffer
 	 */
 	void		(*sc_writetodesc)
-		__P((struct snc_softc *, u_int32_t, u_int32_t, u_int16_t));
+		(struct snc_softc *, u_int32_t, u_int32_t, u_int16_t);
 	u_int16_t	(*sc_readfromdesc)
-		__P((struct snc_softc *, u_int32_t, u_int32_t));
+		(struct snc_softc *, u_int32_t, u_int32_t);
 	void		(*sc_copytobuf)
-		__P((struct snc_softc *, void *, u_int32_t, size_t));
+		(struct snc_softc *, void *, u_int32_t, size_t);
 	void		(*sc_copyfrombuf)
-		__P((struct snc_softc *, void *, u_int32_t, size_t));
+		(struct snc_softc *, void *, u_int32_t, size_t);
 	void		(*sc_zerobuf)
-		__P((struct snc_softc *, u_int32_t, size_t));
+		(struct snc_softc *, u_int32_t, size_t);
 
 	/*
 	 * Machine-dependent functions:
@@ -211,16 +211,15 @@ typedef struct snc_softc {
 	 *	hardware init hook - may be NULL
 	 *	media change hook - may be NULL
 	 */
-	void	(*sc_hwreset) __P((struct snc_softc *));
-	void	(*sc_hwinit) __P((struct snc_softc *));
-	int	(*sc_mediachange) __P((struct snc_softc *));
-	void	(*sc_mediastatus) __P((struct snc_softc *,
-		    struct ifmediareq *));
+	void	(*sc_hwreset)(struct snc_softc *);
+	void	(*sc_hwinit)(struct snc_softc *);
+	int	(*sc_mediachange)(struct snc_softc *);
+	void	(*sc_mediastatus)(struct snc_softc *, struct ifmediareq *);
 
 	int	sc_enabled;	/* boolean; power enabled on interface */
 
-	int	(*sc_enable) __P((struct snc_softc *));
-	void	(*sc_disable) __P((struct snc_softc *));
+	int	(*sc_enable)(struct snc_softc *);
+	void	(*sc_disable)(struct snc_softc *);
 
 	void	*sc_sh;		/* shutdownhook cookie */
 	int	gone;
@@ -302,6 +301,6 @@ typedef struct snc_softc {
 #define	CDA_ENABLE	64	/* mask enabling CAM entries */
 #define	CDA_SIZE(sc)	((4*16 + 1) * ((sc->bitmode) ? 4 : 2))
 
-void	sncconfig __P((struct snc_softc *, int *, int, int, u_int8_t *));
-void	sncintr __P((void *));
-void	sncshutdown __P((void *));
+void	sncconfig(struct snc_softc *, int *, int, int, u_int8_t *);
+void	sncintr(void *);
+void	sncshutdown(void *);
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index 1fc542b..3d207a7 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -56,9 +56,9 @@
 #include <dev/snc/if_sncreg.h>
 #include <dev/snc/if_sncvar.h>
 
-static void snc_isapnp_reconfig	__P((device_t));
-static int snc_isa_probe	__P((device_t));
-static int snc_isa_attach	__P((device_t));
+static void snc_isapnp_reconfig	(device_t);
+static int snc_isa_probe	(device_t);
+static int snc_isa_attach	(device_t);
 
 static struct isa_pnp_id snc_ids[] = {
 	{ 0x6180a3b8,	NULL },		/* NEC8061 NEC PC-9801-104 */
diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h
index 98b2d94..33e39f3 100644
--- a/sys/dev/snc/if_sncvar.h
+++ b/sys/dev/snc/if_sncvar.h
@@ -36,12 +36,12 @@
 
 extern devclass_t snc_devclass;
 
-void	snc_release_resources	__P((device_t));
-int	snc_alloc_port		__P((device_t, int));
-int	snc_alloc_memory	__P((device_t, int));
-int	snc_alloc_irq		__P((device_t, int, int));
+void	snc_release_resources	(device_t);
+int	snc_alloc_port		(device_t, int);
+int	snc_alloc_memory	(device_t, int);
+int	snc_alloc_irq		(device_t, int, int);
 
-int	snc_probe		__P((device_t, int));
-int	snc_attach		__P((device_t));
+int	snc_probe		(device_t, int);
+int	snc_attach		(device_t);
 
-void	snc_shutdown		__P((device_t));
+void	snc_shutdown		(device_t);