Remove __P.

5 files changed, 68 insertions, 70 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8fb2dc8..99b355a 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -75,37 +75,35 @@
 
 devclass_t ed_devclass;
 
-static void	ed_init		__P((void *));
-static int	ed_ioctl	__P((struct ifnet *, u_long, caddr_t));
-static void	ed_start	__P((struct ifnet *));
-static void	ed_reset	__P((struct ifnet *));
-static void	ed_watchdog	__P((struct ifnet *));
+static void	ed_init		(void *);
+static int	ed_ioctl	(struct ifnet *, u_long, caddr_t);
+static void	ed_start	(struct ifnet *);
+static void	ed_reset	(struct ifnet *);
+static void	ed_watchdog	(struct ifnet *);
 #ifndef ED_NO_MIIBUS
-static void	ed_tick		__P((void *));
+static void	ed_tick		(void *);
 #endif
 
-static void	ds_getmcaf	__P((struct ed_softc *, u_int32_t *));
+static void	ds_getmcaf	(struct ed_softc *, u_int32_t *);
 
-static void	ed_get_packet	__P((struct ed_softc *, char *, /* u_short */ int));
+static void	ed_get_packet	(struct ed_softc *, char *, /* u_short */ int);
 
-static __inline void	ed_rint	__P((struct ed_softc *));
-static __inline void	ed_xmit	__P((struct ed_softc *));
-static __inline char *	ed_ring_copy __P((struct ed_softc *, char *, char *,
-					  /* u_short */ int));
-static void	ed_hpp_set_physical_link __P((struct ed_softc *));
-static void	ed_hpp_readmem	__P((struct ed_softc *, int, unsigned char *,
-				    /* u_short */ int));
-static void	ed_hpp_writemem	__P((struct ed_softc *, unsigned char *,
-				    /* u_short */ int, /* u_short */ int));
-static u_short	ed_hpp_write_mbufs __P((struct ed_softc *, struct mbuf *,
-					int));
+static __inline void	ed_rint	(struct ed_softc *);
+static __inline void	ed_xmit	(struct ed_softc *);
+static __inline char *	ed_ring_copy(struct ed_softc *, char *, char *,
+					  /* u_short */ int);
+static void	ed_hpp_set_physical_link(struct ed_softc *);
+static void	ed_hpp_readmem	(struct ed_softc *, int, unsigned char *,
+				    /* u_short */ int);
+static void	ed_hpp_writemem	(struct ed_softc *, unsigned char *,
+				    /* u_short */ int, /* u_short */ int);
+static u_short	ed_hpp_write_mbufs(struct ed_softc *, struct mbuf *, int);
 
-static u_short	ed_pio_write_mbufs __P((struct ed_softc *, struct mbuf *,
-					int));
+static u_short	ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, int);
 
-static void	ed_setrcr	__P((struct ed_softc *));
+static void	ed_setrcr	(struct ed_softc *);
 
-static u_int32_t ds_crc		__P((u_char *ep));
+static u_int32_t ds_crc		(u_char *ep);
 
 /*
  * Interrupt conversion table for WD/SMC ASIC/83C584
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 1ea4af8..307323f 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -54,25 +54,25 @@
 #include <dev/ed/if_edreg.h>
 #include <dev/ed/if_ed98.h>
 
-static int ed98_alloc_port	__P((device_t, int));
-static int ed98_alloc_memory	__P((device_t, int));
-static int ed_pio_testmem	__P((struct ed_softc *, int, int, int));
-static int ed_probe_SIC98	__P((device_t, int, int));
-static int ed_probe_CNET98	__P((device_t, int, int));
-static int ed_probe_CNET98EL	__P((device_t, int, int));
-static int ed_probe_NEC77	__P((device_t, int, int));
-static int ed_probe_NW98X	__P((device_t, int, int));
-static int ed_probe_SB98	__P((device_t, int, int));
-static int ed_probe_EZ98	__P((device_t, int, int));
-static int ed98_probe_Novell	__P((device_t, int, int));
-static int ed98_probe_generic8390	__P((struct ed_softc *));
-static void ed_reset_CNET98	__P((struct ed_softc *, int));
-static void ed_winsel_CNET98	__P((struct ed_softc *, u_short));
-static void ed_get_SB98		__P((struct ed_softc *));
+static int ed98_alloc_port	(device_t, int);
+static int ed98_alloc_memory	(device_t, int);
+static int ed_pio_testmem	(struct ed_softc *, int, int, int);
+static int ed_probe_SIC98	(device_t, int, int);
+static int ed_probe_CNET98	(device_t, int, int);
+static int ed_probe_CNET98EL	(device_t, int, int);
+static int ed_probe_NEC77	(device_t, int, int);
+static int ed_probe_NW98X	(device_t, int, int);
+static int ed_probe_SB98	(device_t, int, int);
+static int ed_probe_EZ98	(device_t, int, int);
+static int ed98_probe_Novell	(device_t, int, int);
+static int ed98_probe_generic8390	(struct ed_softc *);
+static void ed_reset_CNET98	(struct ed_softc *, int);
+static void ed_winsel_CNET98	(struct ed_softc *, u_short);
+static void ed_get_SB98		(struct ed_softc *);
 #endif
 
-static int ed_isa_probe		__P((device_t));
-static int ed_isa_attach	__P((device_t));
+static int ed_isa_probe		(device_t);
+static int ed_isa_attach	(device_t);
 
 static struct isa_pnp_id ed_ids[] = {
 #ifdef PC98
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index fe00356..a08ae0e 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -44,8 +44,8 @@
 
 #include <dev/ed/if_edvar.h>
 
-static int ed_isa_probe		__P((device_t));
-static int ed_isa_attach	__P((device_t));
+static int ed_isa_probe		(device_t);
+static int ed_isa_attach	(device_t);
 
 static struct isa_pnp_id ed_ids[] = {
 	{ 0x1684a34d,	NULL },		/* SMC8416 */
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 144ba82..a283b6e 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -58,8 +58,8 @@ static struct _pcsid
 	{ 0x00000000,	NULL					}
 };
 
-static int	ed_pci_probe	__P((device_t));
-static int	ed_pci_attach	__P((device_t));
+static int	ed_pci_probe	(device_t);
+static int	ed_pci_attach	(device_t);
 
 static int
 ed_pci_probe (device_t dev)
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 0679198..3855b6d 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -50,8 +50,8 @@ struct ed_softc {
 	struct resource* irq_res; /* resource for irq */
 	void*	irq_handle;	/* handle for irq handler */
 	device_t miibus;	/* MII bus for cards with MII. */
-	void	(*mii_writebits)__P((struct ed_softc *, u_int, int));
-	u_int	(*mii_readbits)__P((struct ed_softc *, int));
+	void	(*mii_writebits)(struct ed_softc *, u_int, int);
+	u_int	(*mii_readbits)(struct ed_softc *, int);
 	struct callout_handle tick_ch; /* Callout handle for ed_tick */
 
 	int	nic_offset;	/* NIC (DS8390) I/O bus address offset */
@@ -190,31 +190,31 @@ struct ed_softc {
 		rman_get_bushandle((sc)->port_res), \
 		(sc)->asic_offset + (port), (u_int32_t *)(addr), (count))
 
-void	ed_release_resources	__P((device_t));
-int	ed_alloc_port		__P((device_t, int, int));
-int	ed_alloc_memory		__P((device_t, int, int));
-int	ed_alloc_irq		__P((device_t, int, int));
-
-int	ed_probe_generic8390	__P((struct ed_softc *));
-int	ed_probe_WD80x3		__P((device_t, int, int));
-int	ed_probe_WD80x3_generic	__P((device_t, int, unsigned short *[]));
-int	ed_probe_3Com		__P((device_t, int, int));
-int	ed_probe_Novell		__P((device_t, int, int));
-int	ed_probe_Novell_generic	__P((device_t, int));
-int	ed_probe_HP_pclanp	__P((device_t, int, int));
-
-int	ed_attach		__P((struct ed_softc *, int, int));
-void	ed_stop			__P((struct ed_softc *));
-void	ed_pio_readmem		__P((struct ed_softc *, int, unsigned char *,
-				     unsigned short));
-void	ed_pio_writemem		__P((struct ed_softc *, char *,
-				     unsigned short, unsigned short));
+void	ed_release_resources	(device_t);
+int	ed_alloc_port		(device_t, int, int);
+int	ed_alloc_memory		(device_t, int, int);
+int	ed_alloc_irq		(device_t, int, int);
+
+int	ed_probe_generic8390	(struct ed_softc *);
+int	ed_probe_WD80x3		(device_t, int, int);
+int	ed_probe_WD80x3_generic	(device_t, int, unsigned short *[]);
+int	ed_probe_3Com		(device_t, int, int);
+int	ed_probe_Novell		(device_t, int, int);
+int	ed_probe_Novell_generic	(device_t, int);
+int	ed_probe_HP_pclanp	(device_t, int, int);
+
+int	ed_attach		(struct ed_softc *, int, int);
+void	ed_stop			(struct ed_softc *);
+void	ed_pio_readmem		(struct ed_softc *, int, unsigned char *,
+				     unsigned short);
+void	ed_pio_writemem		(struct ed_softc *, char *,
+				     unsigned short, unsigned short);
 #ifndef ED_NO_MIIBUS
-int	ed_miibus_readreg	__P((device_t, int, int));
-void	ed_miibus_writereg	__P((device_t, int, int, int));
-int	ed_ifmedia_upd		__P((struct ifnet *));
-void	ed_ifmedia_sts		__P((struct ifnet *, struct ifmediareq *));
-void	ed_child_detached	__P((device_t, device_t));
+int	ed_miibus_readreg	(device_t, int, int);
+void	ed_miibus_writereg	(device_t, int, int, int);
+int	ed_ifmedia_upd		(struct ifnet *);
+void	ed_ifmedia_sts		(struct ifnet *, struct ifmediareq *);
+void	ed_child_detached	(device_t, device_t);
 #endif
 
 driver_intr_t	edintr;