Remove __P.

3 files changed, 74 insertions, 79 deletions

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 0968d4a..daf38c7 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -93,9 +93,9 @@ static const char rcsid[] =
  */
 #define COMPAQ_PRESARIO_ID	0xb0bb0e11
 
-static int dcphy_probe		__P((device_t));
-static int dcphy_attach		__P((device_t));
-static int dcphy_detach		__P((device_t));
+static int dcphy_probe		(device_t);
+static int dcphy_attach		(device_t);
+static int dcphy_detach		(device_t);
 
 static device_method_t dcphy_methods[] = {
 	/* device interface */
@@ -116,10 +116,10 @@ static driver_t dcphy_driver = {
 
 DRIVER_MODULE(dcphy, miibus, dcphy_driver, dcphy_devclass, 0, 0);
 
-static int	dcphy_service __P((struct mii_softc *, struct mii_data *, int));
-static void	dcphy_status __P((struct mii_softc *));
-static void	dcphy_reset __P((struct mii_softc *));
-static int	dcphy_auto __P((struct mii_softc *, int));
+static int	dcphy_service(struct mii_softc *, struct mii_data *, int);
+static void	dcphy_status(struct mii_softc *);
+static void	dcphy_reset(struct mii_softc *);
+static int	dcphy_auto(struct mii_softc *, int);
 
 static int dcphy_probe(dev)
 	device_t		dev;
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index abafb7e..fa8cd2e 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -195,75 +195,70 @@ static struct dc_type dc_devs[] = {
 	{ 0, 0, NULL }
 };
 
-static int dc_probe		__P((device_t));
-static int dc_attach		__P((device_t));
-static int dc_detach		__P((device_t));
-static void dc_acpi		__P((device_t));
-static struct dc_type *dc_devtype	__P((device_t));
-static int dc_newbuf		__P((struct dc_softc *, int, struct mbuf *));
-static int dc_encap		__P((struct dc_softc *, struct mbuf *,
-					u_int32_t *));
-static int dc_coal		__P((struct dc_softc *, struct mbuf **));
-static void dc_pnic_rx_bug_war	__P((struct dc_softc *, int));
-static int dc_rx_resync		__P((struct dc_softc *));
-static void dc_rxeof		__P((struct dc_softc *));
-static void dc_txeof		__P((struct dc_softc *));
-static void dc_tick		__P((void *));
-static void dc_tx_underrun	__P((struct dc_softc *));
-static void dc_intr		__P((void *));
-static void dc_start		__P((struct ifnet *));
-static int dc_ioctl		__P((struct ifnet *, u_long, caddr_t));
-static void dc_init		__P((void *));
-static void dc_stop		__P((struct dc_softc *));
-static void dc_watchdog		__P((struct ifnet *));
-static void dc_shutdown		__P((device_t));
-static int dc_ifmedia_upd	__P((struct ifnet *));
-static void dc_ifmedia_sts	__P((struct ifnet *, struct ifmediareq *));
-
-static void dc_delay		__P((struct dc_softc *));
-static void dc_eeprom_idle	__P((struct dc_softc *));
-static void dc_eeprom_putbyte	__P((struct dc_softc *, int));
-static void dc_eeprom_getword	__P((struct dc_softc *, int, u_int16_t *));
+static int dc_probe		(device_t);
+static int dc_attach		(device_t);
+static int dc_detach		(device_t);
+static void dc_acpi		(device_t);
+static struct dc_type *dc_devtype	(device_t);
+static int dc_newbuf		(struct dc_softc *, int, struct mbuf *);
+static int dc_encap		(struct dc_softc *, struct mbuf *, u_int32_t *);
+static int dc_coal		(struct dc_softc *, struct mbuf **);
+static void dc_pnic_rx_bug_war	(struct dc_softc *, int);
+static int dc_rx_resync		(struct dc_softc *);
+static void dc_rxeof		(struct dc_softc *);
+static void dc_txeof		(struct dc_softc *);
+static void dc_tick		(void *);
+static void dc_tx_underrun	(struct dc_softc *);
+static void dc_intr		(void *);
+static void dc_start		(struct ifnet *);
+static int dc_ioctl		(struct ifnet *, u_long, caddr_t);
+static void dc_init		(void *);
+static void dc_stop		(struct dc_softc *);
+static void dc_watchdog		(struct ifnet *);
+static void dc_shutdown		(device_t);
+static int dc_ifmedia_upd	(struct ifnet *);
+static void dc_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
+
+static void dc_delay		(struct dc_softc *);
+static void dc_eeprom_idle	(struct dc_softc *);
+static void dc_eeprom_putbyte	(struct dc_softc *, int);
+static void dc_eeprom_getword	(struct dc_softc *, int, u_int16_t *);
 static void dc_eeprom_getword_pnic
-				__P((struct dc_softc *, int, u_int16_t *));
+				(struct dc_softc *, int, u_int16_t *);
 static void dc_eeprom_getword_xircom
-				__P((struct dc_softc *, int, u_int16_t *));
-static void dc_read_eeprom	__P((struct dc_softc *, caddr_t, int,
-							int, int));
-
-static void dc_mii_writebit	__P((struct dc_softc *, int));
-static int dc_mii_readbit	__P((struct dc_softc *));
-static void dc_mii_sync		__P((struct dc_softc *));
-static void dc_mii_send		__P((struct dc_softc *, u_int32_t, int));
-static int dc_mii_readreg	__P((struct dc_softc *, struct dc_mii_frame *));
-static int dc_mii_writereg	__P((struct dc_softc *, struct dc_mii_frame *));
-static int dc_miibus_readreg	__P((device_t, int, int));
-static int dc_miibus_writereg	__P((device_t, int, int, int));
-static void dc_miibus_statchg	__P((device_t));
-static void dc_miibus_mediainit	__P((device_t));
-
-static void dc_setcfg		__P((struct dc_softc *, int));
-static u_int32_t dc_crc_le	__P((struct dc_softc *, caddr_t));
-static u_int32_t dc_crc_be	__P((caddr_t));
-static void dc_setfilt_21143	__P((struct dc_softc *));
-static void dc_setfilt_asix	__P((struct dc_softc *));
-static void dc_setfilt_admtek	__P((struct dc_softc *));
-static void dc_setfilt_xircom	__P((struct dc_softc *));
-
-static void dc_setfilt		__P((struct dc_softc *));
-
-static void dc_reset		__P((struct dc_softc *));
-static int dc_list_rx_init	__P((struct dc_softc *));
-static int dc_list_tx_init	__P((struct dc_softc *));
-
-static void dc_parse_21143_srom	__P((struct dc_softc *));
-static void dc_decode_leaf_sia	__P((struct dc_softc *,
-				    struct dc_eblock_sia *));
-static void dc_decode_leaf_mii	__P((struct dc_softc *,
-				    struct dc_eblock_mii *));
-static void dc_decode_leaf_sym	__P((struct dc_softc *,
-				    struct dc_eblock_sym *));
-static void dc_apply_fixup	__P((struct dc_softc *, int));
+				(struct dc_softc *, int, u_int16_t *);
+static void dc_read_eeprom	(struct dc_softc *, caddr_t, int, int, int);
+
+static void dc_mii_writebit	(struct dc_softc *, int);
+static int dc_mii_readbit	(struct dc_softc *);
+static void dc_mii_sync		(struct dc_softc *);
+static void dc_mii_send		(struct dc_softc *, u_int32_t, int);
+static int dc_mii_readreg	(struct dc_softc *, struct dc_mii_frame *);
+static int dc_mii_writereg	(struct dc_softc *, struct dc_mii_frame *);
+static int dc_miibus_readreg	(device_t, int, int);
+static int dc_miibus_writereg	(device_t, int, int, int);
+static void dc_miibus_statchg	(device_t);
+static void dc_miibus_mediainit	(device_t);
+
+static void dc_setcfg		(struct dc_softc *, int);
+static u_int32_t dc_crc_le	(struct dc_softc *, caddr_t);
+static u_int32_t dc_crc_be	(caddr_t);
+static void dc_setfilt_21143	(struct dc_softc *);
+static void dc_setfilt_asix	(struct dc_softc *);
+static void dc_setfilt_admtek	(struct dc_softc *);
+static void dc_setfilt_xircom	(struct dc_softc *);
+
+static void dc_setfilt		(struct dc_softc *);
+
+static void dc_reset		(struct dc_softc *);
+static int dc_list_rx_init	(struct dc_softc *);
+static int dc_list_tx_init	(struct dc_softc *);
+
+static void dc_parse_21143_srom	(struct dc_softc *);
+static void dc_decode_leaf_sia	(struct dc_softc *, struct dc_eblock_sia *);
+static void dc_decode_leaf_mii	(struct dc_softc *, struct dc_eblock_mii *);
+static void dc_decode_leaf_sym	(struct dc_softc *, struct dc_eblock_sym *);
+static void dc_apply_fixup	(struct dc_softc *, int);
 
 #ifdef DC_USEIOSPACE
 #define DC_RES			SYS_RES_IOPORT
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index dce8282..56a83f4 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -80,9 +80,9 @@ static const char rcsid[] =
         CSR_WRITE_4(sc, reg,                            \
                 CSR_READ_4(sc, reg) & ~x)
 
-static int pnphy_probe		__P((device_t));
-static int pnphy_attach		__P((device_t));
-static int pnphy_detach		__P((device_t));
+static int pnphy_probe		(device_t);
+static int pnphy_attach		(device_t);
+static int pnphy_detach		(device_t);
 
 static device_method_t pnphy_methods[] = {
 	/* device interface */
@@ -103,8 +103,8 @@ static driver_t pnphy_driver = {
 
 DRIVER_MODULE(pnphy, miibus, pnphy_driver, pnphy_devclass, 0, 0);
 
-static int	pnphy_service __P((struct mii_softc *, struct mii_data *, int));
-static void	pnphy_status __P((struct mii_softc *));
+static int	pnphy_service(struct mii_softc *, struct mii_data *, int);
+static void	pnphy_status(struct mii_softc *);
 
 static int pnphy_probe(dev)
 	device_t		dev;