7 files changed, 102 insertions, 104 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 788d7b4239d27..1f1c642f2dd06 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -128,50 +128,49 @@ Static struct aue_type aue_devs[] = {
 
 Static struct usb_qdat aue_qdat;
 
-Static int aue_match		__P((device_t));
-Static int aue_attach		__P((device_t));
-Static int aue_detach		__P((device_t));
+Static int aue_match		(device_t);
+Static int aue_attach		(device_t);
+Static int aue_detach		(device_t);
 
-Static void aue_reset_pegasus_II __P((struct aue_softc *));
-Static int aue_tx_list_init	__P((struct aue_softc *));
-Static int aue_rx_list_init	__P((struct aue_softc *));
-Static int aue_newbuf		__P((struct aue_softc *, struct aue_chain *,
-				    struct mbuf *));
-Static int aue_encap		__P((struct aue_softc *, struct mbuf *, int));
+Static void aue_reset_pegasus_II(struct aue_softc *);
+Static int aue_tx_list_init	(struct aue_softc *);
+Static int aue_rx_list_init	(struct aue_softc *);
+Static int aue_newbuf		(struct aue_softc *, struct aue_chain *,
+				    struct mbuf *);
+Static int aue_encap		(struct aue_softc *, struct mbuf *, int);
 #ifdef AUE_INTR_PIPE
-Static void aue_intr		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
+Static void aue_intr		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
 #endif
-Static void aue_rxeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void aue_txeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void aue_tick		__P((void *));
-Static void aue_rxstart		__P((struct ifnet *));
-Static void aue_start		__P((struct ifnet *));
-Static int aue_ioctl		__P((struct ifnet *, u_long, caddr_t));
-Static void aue_init		__P((void *));
-Static void aue_stop		__P((struct aue_softc *));
-Static void aue_watchdog		__P((struct ifnet *));
-Static void aue_shutdown		__P((device_t));
-Static int aue_ifmedia_upd	__P((struct ifnet *));
-Static void aue_ifmedia_sts	__P((struct ifnet *, struct ifmediareq *));
+Static void aue_rxeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void aue_txeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void aue_tick		(void *);
+Static void aue_rxstart		(struct ifnet *);
+Static void aue_start		(struct ifnet *);
+Static int aue_ioctl		(struct ifnet *, u_long, caddr_t);
+Static void aue_init		(void *);
+Static void aue_stop		(struct aue_softc *);
+Static void aue_watchdog		(struct ifnet *);
+Static void aue_shutdown		(device_t);
+Static int aue_ifmedia_upd	(struct ifnet *);
+Static void aue_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
 
-Static void aue_eeprom_getword	__P((struct aue_softc *, int, u_int16_t *));
-Static void aue_read_eeprom	__P((struct aue_softc *, caddr_t, int,
-							int, int));
-Static int aue_miibus_readreg	__P((device_t, int, int));
-Static int aue_miibus_writereg	__P((device_t, int, int, int));
-Static void aue_miibus_statchg	__P((device_t));
+Static void aue_eeprom_getword	(struct aue_softc *, int, u_int16_t *);
+Static void aue_read_eeprom	(struct aue_softc *, caddr_t, int, int, int);
+Static int aue_miibus_readreg	(device_t, int, int);
+Static int aue_miibus_writereg	(device_t, int, int, int);
+Static void aue_miibus_statchg	(device_t);
 
-Static void aue_setmulti	__P((struct aue_softc *));
-Static u_int32_t aue_crc	__P((caddr_t));
-Static void aue_reset		__P((struct aue_softc *));
+Static void aue_setmulti	(struct aue_softc *);
+Static u_int32_t aue_crc	(caddr_t);
+Static void aue_reset		(struct aue_softc *);
 
-Static int csr_read_1		__P((struct aue_softc *, int));
-Static int csr_write_1		__P((struct aue_softc *, int, int));
-Static int csr_read_2		__P((struct aue_softc *, int));
-Static int csr_write_2		__P((struct aue_softc *, int, int));
+Static int csr_read_1		(struct aue_softc *, int);
+Static int csr_write_1		(struct aue_softc *, int, int);
+Static int csr_read_2		(struct aue_softc *, int);
+Static int csr_write_2		(struct aue_softc *, int, int);
 
 Static device_method_t aue_methods[] = {
 	/* Device interface */
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index d7342b2df617b..1a3a69edaa288 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -93,41 +93,40 @@ Static struct cue_type cue_devs[] = {
 
 Static struct usb_qdat cue_qdat;
 
-Static int cue_match		__P((device_t));
-Static int cue_attach		__P((device_t));
-Static int cue_detach		__P((device_t));
+Static int cue_match		(device_t);
+Static int cue_attach		(device_t);
+Static int cue_detach		(device_t);
 
-Static int cue_tx_list_init	__P((struct cue_softc *));
-Static int cue_rx_list_init	__P((struct cue_softc *));
-Static int cue_newbuf		__P((struct cue_softc *, struct cue_chain *,
-				    struct mbuf *));
-Static int cue_encap		__P((struct cue_softc *, struct mbuf *, int));
-Static void cue_rxeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void cue_txeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void cue_tick		__P((void *));
-Static void cue_rxstart		__P((struct ifnet *));
-Static void cue_start		__P((struct ifnet *));
-Static int cue_ioctl		__P((struct ifnet *, u_long, caddr_t));
-Static void cue_init		__P((void *));
-Static void cue_stop		__P((struct cue_softc *));
-Static void cue_watchdog		__P((struct ifnet *));
-Static void cue_shutdown		__P((device_t));
+Static int cue_tx_list_init	(struct cue_softc *);
+Static int cue_rx_list_init	(struct cue_softc *);
+Static int cue_newbuf		(struct cue_softc *, struct cue_chain *,
+				    struct mbuf *);
+Static int cue_encap		(struct cue_softc *, struct mbuf *, int);
+Static void cue_rxeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void cue_txeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void cue_tick		(void *);
+Static void cue_rxstart		(struct ifnet *);
+Static void cue_start		(struct ifnet *);
+Static int cue_ioctl		(struct ifnet *, u_long, caddr_t);
+Static void cue_init		(void *);
+Static void cue_stop		(struct cue_softc *);
+Static void cue_watchdog		(struct ifnet *);
+Static void cue_shutdown		(device_t);
 
-Static void cue_setmulti	__P((struct cue_softc *));
-Static u_int32_t cue_crc	__P((caddr_t));
-Static void cue_reset		__P((struct cue_softc *));
+Static void cue_setmulti	(struct cue_softc *);
+Static u_int32_t cue_crc	(caddr_t);
+Static void cue_reset		(struct cue_softc *);
 
-Static int csr_read_1		__P((struct cue_softc *, int));
-Static int csr_write_1		__P((struct cue_softc *, int, int));
-Static int csr_read_2		__P((struct cue_softc *, int));
+Static int csr_read_1		(struct cue_softc *, int);
+Static int csr_write_1		(struct cue_softc *, int, int);
+Static int csr_read_2		(struct cue_softc *, int);
 #ifdef notdef
-Static int csr_write_2		__P((struct cue_softc *, int, int));
+Static int csr_write_2		(struct cue_softc *, int, int);
 #endif
-Static int cue_mem		__P((struct cue_softc *, int,
-				    int, void *, int));
-Static int cue_getmac		__P((struct cue_softc *, void *));
+Static int cue_mem		(struct cue_softc *, int, int, void *, int);
+Static int cue_getmac		(struct cue_softc *, void *);
 
 Static device_method_t cue_methods[] = {
 	/* Device interface */
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 44407cc939f76..8b9261a3a8be7 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -125,36 +125,36 @@ Static struct kue_type kue_devs[] = {
 
 Static struct usb_qdat kue_qdat;
 
-Static int kue_match		__P((device_t));
-Static int kue_attach		__P((device_t));
-Static int kue_detach		__P((device_t));
-Static void kue_shutdown		__P((device_t));
-Static int kue_tx_list_init	__P((struct kue_softc *));
-Static int kue_rx_list_init	__P((struct kue_softc *));
-Static int kue_newbuf		__P((struct kue_softc *, struct kue_chain *,
-				    struct mbuf *));
-Static int kue_encap		__P((struct kue_softc *, struct mbuf *, int));
-Static void kue_rxeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void kue_txeof		__P((usbd_xfer_handle,
-				    usbd_private_handle, usbd_status));
-Static void kue_start		__P((struct ifnet *));
-Static void kue_rxstart		__P((struct ifnet *));
-Static int kue_ioctl		__P((struct ifnet *, u_long, caddr_t));
-Static void kue_init		__P((void *));
-Static void kue_stop		__P((struct kue_softc *));
-Static void kue_watchdog		__P((struct ifnet *));
+Static int kue_match		(device_t);
+Static int kue_attach		(device_t);
+Static int kue_detach		(device_t);
+Static void kue_shutdown		(device_t);
+Static int kue_tx_list_init	(struct kue_softc *);
+Static int kue_rx_list_init	(struct kue_softc *);
+Static int kue_newbuf		(struct kue_softc *, struct kue_chain *,
+				    struct mbuf *);
+Static int kue_encap		(struct kue_softc *, struct mbuf *, int);
+Static void kue_rxeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void kue_txeof		(usbd_xfer_handle,
+				    usbd_private_handle, usbd_status);
+Static void kue_start		(struct ifnet *);
+Static void kue_rxstart		(struct ifnet *);
+Static int kue_ioctl		(struct ifnet *, u_long, caddr_t);
+Static void kue_init		(void *);
+Static void kue_stop		(struct kue_softc *);
+Static void kue_watchdog		(struct ifnet *);
 
-Static void kue_setmulti	__P((struct kue_softc *));
-Static void kue_reset		__P((struct kue_softc *));
+Static void kue_setmulti	(struct kue_softc *);
+Static void kue_reset		(struct kue_softc *);
 
 Static usbd_status kue_do_request
-				__P((usbd_device_handle,
-				    usb_device_request_t *, void *));
-Static usbd_status kue_ctl	__P((struct kue_softc *, int, u_int8_t,
-				    u_int16_t, char *, int));
-Static usbd_status kue_setword	__P((struct kue_softc *, u_int8_t, u_int16_t));
-Static int kue_load_fw		__P((struct kue_softc *));
+				(usbd_device_handle,
+				    usb_device_request_t *, void *);
+Static usbd_status kue_ctl	(struct kue_softc *, int, u_int8_t,
+				    u_int16_t, char *, int);
+Static usbd_status kue_setword	(struct kue_softc *, u_int8_t, u_int16_t);
+Static int kue_load_fw		(struct kue_softc *);
 
 Static device_method_t kue_methods[] = {
 	/* Device interface */
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 2ac3fff0deada..47ca6461ed8bc 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -541,9 +541,9 @@ Static int umass_atapi_transform	(struct umass_softc *sc,
 		     		unsigned char **rcmd, int *rcmdlen);
 
 /* RBC specific functions */
-Static int umass_rbc_transform	__P((struct umass_softc *sc,
+Static int umass_rbc_transform	(struct umass_softc *sc,
 				unsigned char *cmd, int cmdlen,
-		     		unsigned char **rcmd, int *rcmdlen));
+		     		unsigned char **rcmd, int *rcmdlen);
 
 #ifdef UMASS_DEBUG
 /* General debugging functions */
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 3065c47900b58..395ea6fab46a1 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -76,7 +76,7 @@ Static struct ifqueue usbq_rx;
 Static struct ifqueue usbq_tx;
 Static int mtx_inited = 0;
 
-Static void usbintr		__P((void));
+Static void usbintr		(void);
 
 Static void usbintr()
 {
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index d98be8c48443c..29cdde5a0c016 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/dev/usb/usb_ethersubr.h
@@ -41,11 +41,11 @@
 
 struct usb_qdat {
 	struct ifnet		*ifp;
-	void (*if_rxstart)	__P((struct ifnet *));
+	void (*if_rxstart)	(struct ifnet *);
 };
 
-void usb_register_netisr	__P((void));
-void usb_ether_input		__P((struct mbuf *));
-void usb_tx_done		__P((struct mbuf *));
+void usb_register_netisr	(void);
+void usb_ether_input		(struct mbuf *);
+void usb_tx_done		(struct mbuf *);
 
 #endif
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 74f5e5e481194..ca0eee948098a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -53,7 +53,7 @@ struct usbd_endpoint {
 
 struct usbd_bus_methods {
 	usbd_status	      (*open_pipe)(struct usbd_pipe *pipe);
-	void		      (*soft_intr)__P((struct usbd_bus *));
+	void		      (*soft_intr)(struct usbd_bus *);
 	void		      (*do_poll)(struct usbd_bus *);
 	usbd_status	      (*allocm)(struct usbd_bus *, usb_dma_t *,
 					    u_int32_t bufsize);
@@ -241,7 +241,7 @@ void		usb_disconnect_port(struct usbd_port *up, device_ptr_t);
 
 /* Routines from usb.c */
 void		usb_needs_explore(usbd_bus_handle);
-void		usb_schedsoftintr __P((struct usbd_bus *));
+void		usb_schedsoftintr(struct usbd_bus *);
 
 #ifdef DIAGNOSTIC
 #define SPLUSBCHECK \