Remove __P().

6 files changed, 126 insertions, 126 deletions

diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 1664864..3f687e0 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -80,28 +80,28 @@ MALLOC_DEFINE(M_FWXFER, "fw_xfer", "XFER/FireWire");
 
 devclass_t firewire_devclass;
 
-static int firewire_match      __P((device_t));
-static int firewire_attach      __P((device_t));
-static int firewire_detach      __P((device_t));
-static int firewire_resume      __P((device_t));
+static int firewire_match      (device_t);
+static int firewire_attach      (device_t);
+static int firewire_detach      (device_t);
+static int firewire_resume      (device_t);
 #if 0
-static int firewire_shutdown    __P((device_t));
+static int firewire_shutdown    (device_t);
 #endif
-static device_t firewire_add_child   __P((device_t, int, const char *, int));
-static void fw_try_bmr __P((void *));
-static void fw_try_bmr_callback __P((struct fw_xfer *));
-static void fw_asystart __P((struct fw_xfer *));
-static int fw_get_tlabel __P((struct firewire_comm *, struct fw_xfer *));
-static void fw_bus_probe __P((struct firewire_comm *));
-static void fw_bus_explore __P((struct firewire_comm *));
-static void fw_bus_explore_callback __P((struct fw_xfer *));
-static void fw_attach_dev __P((struct firewire_comm *));
+static device_t firewire_add_child   (device_t, int, const char *, int);
+static void fw_try_bmr (void *);
+static void fw_try_bmr_callback (struct fw_xfer *);
+static void fw_asystart (struct fw_xfer *);
+static int fw_get_tlabel (struct firewire_comm *, struct fw_xfer *);
+static void fw_bus_probe (struct firewire_comm *);
+static void fw_bus_explore (struct firewire_comm *);
+static void fw_bus_explore_callback (struct fw_xfer *);
+static void fw_attach_dev (struct firewire_comm *);
 #ifdef FW_VMACCESS
-static void fw_vmaccess __P((struct fw_xfer *));
+static void fw_vmaccess (struct fw_xfer *);
 #endif
-struct fw_xfer *asyreqq __P((struct firewire_comm *, u_int8_t, u_int8_t, u_int8_t,
-	u_int32_t, u_int32_t, void (*)__P((struct fw_xfer *))));
-static int fw_bmr __P((struct firewire_comm *));
+struct fw_xfer *asyreqq (struct firewire_comm *, u_int8_t, u_int8_t, u_int8_t,
+	u_int32_t, u_int32_t, void (*)(struct fw_xfer *));
+static int fw_bmr (struct firewire_comm *);
 
 static device_method_t firewire_methods[] = {
 	/* Device interface */
@@ -1393,7 +1393,7 @@ done:
 struct fw_xfer *
 asyreqq(struct firewire_comm *fc, u_int8_t spd, u_int8_t tl, u_int8_t rt,
 	u_int32_t addr_hi, u_int32_t addr_lo,
-	void (*hand) __P((struct fw_xfer*)))
+	void (*hand) (struct fw_xfer*))
 {
 	struct fw_xfer *xfer;
 	struct fw_pkt *fp;
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 1e205c1..bea218b 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -81,8 +81,8 @@ struct firewire_softc {
 struct firewire_dev_comm {
 	device_t dev;
 	struct firewire_comm *fc;
-	void (*post_busreset) __P((void *));
-	void (*post_explore) __P((void *));
+	void (*post_busreset) (void *);
+	void (*post_explore) (void *);
 };
 
 struct tcode_info {
@@ -150,19 +150,19 @@ struct firewire_comm{
 	struct callout bmr_callout;
 	struct callout timeout_callout;
 	struct callout retry_probe_callout;
-	u_int32_t (*cyctimer) __P((struct  firewire_comm *));
-	void (*ibr) __P((struct firewire_comm *));
-	u_int32_t (*set_bmr) __P((struct firewire_comm *, u_int32_t));
-	int (*ioctl) __P((dev_t, u_long, caddr_t, int, fw_proc *));
-	int (*irx_enable) __P((struct firewire_comm *, int));
-	int (*irx_disable) __P((struct firewire_comm *, int));
-	int (*itx_enable) __P((struct firewire_comm *, int));
-	int (*itx_disable) __P((struct firewire_comm *, int));
-	void (*timeout) __P((void *));
-	void (*poll) __P((struct firewire_comm *, int, int));
-	void (*set_intr) __P((struct firewire_comm *, int));
-	void (*irx_post) __P((struct firewire_comm *, u_int32_t *));
-	void (*itx_post) __P((struct firewire_comm *, u_int32_t *));
+	u_int32_t (*cyctimer) (struct  firewire_comm *);
+	void (*ibr) (struct firewire_comm *);
+	u_int32_t (*set_bmr) (struct firewire_comm *, u_int32_t);
+	int (*ioctl) (dev_t, u_long, caddr_t, int, fw_proc *);
+	int (*irx_enable) (struct firewire_comm *, int);
+	int (*irx_disable) (struct firewire_comm *, int);
+	int (*itx_enable) (struct firewire_comm *, int);
+	int (*itx_disable) (struct firewire_comm *, int);
+	void (*timeout) (void *);
+	void (*poll) (struct firewire_comm *, int, int);
+	void (*set_intr) (struct firewire_comm *, int);
+	void (*irx_post) (struct firewire_comm *, u_int32_t *);
+	void (*itx_post) (struct firewire_comm *, u_int32_t *);
 	struct tcode_info *tcode;
 	bus_dma_tag_t dmat;
 };
@@ -188,7 +188,7 @@ struct fw_xferq {
 
 #define FWXFERQ_HANDLER (1 << 16)
 #define FWXFERQ_WAKEUP (1 << 17)
-	void (*start) __P((struct firewire_comm*));
+	void (*start) (struct firewire_comm*);
 	int dmach;
 	STAILQ_HEAD(, fw_xfer) q;
 	u_int queued;
@@ -205,7 +205,7 @@ struct fw_xferq {
 	struct fw_bulkxfer *stproc;
 	struct selinfo rsel;
 	caddr_t sc;
-	void (*hand) __P((struct fw_xferq *));
+	void (*hand) (struct fw_xferq *);
 };
 
 struct fw_bulkxfer{
@@ -251,9 +251,9 @@ struct fw_xfer{
 	u_int8_t state;
 	u_int8_t retry;
 	u_int8_t tl;
-	void (*retry_req) __P((struct fw_xfer *));
+	void (*retry_req) (struct fw_xfer *);
 	union{
-		void (*hand) __P((struct fw_xfer *));
+		void (*hand) (struct fw_xfer *);
 	} act;
 	struct {
 		struct fw_pkt hdr;
@@ -274,33 +274,33 @@ struct fw_rcv_buf {
 	u_int8_t spd;
 };
 
-void fw_sidrcv __P((struct firewire_comm *, u_int32_t *, u_int));
-void fw_rcv __P((struct fw_rcv_buf *));
-void fw_xfer_unload __P(( struct fw_xfer*));
-void fw_xfer_free_buf __P(( struct fw_xfer*));
-void fw_xfer_free __P(( struct fw_xfer*));
-struct fw_xfer *fw_xfer_alloc __P((struct malloc_type *));
-struct fw_xfer *fw_xfer_alloc_buf __P((struct malloc_type *, int, int));
-void fw_init __P((struct firewire_comm *));
-int fw_tbuf_update __P((struct firewire_comm *, int, int));
-int fw_rbuf_update __P((struct firewire_comm *, int, int));
-void fw_asybusy __P((struct fw_xfer *));
-int fw_bindadd __P((struct firewire_comm *, struct fw_bind *));
-int fw_bindremove __P((struct firewire_comm *, struct fw_bind *));
-int fw_asyreq __P((struct firewire_comm *, int, struct fw_xfer*));
-void fw_busreset __P((struct firewire_comm *));
-u_int16_t fw_crc16 __P((u_int32_t *, u_int32_t));
-void fw_xfer_timeout __P((void *));
-void fw_xfer_done __P((struct fw_xfer *));
-void fw_asy_callback __P((struct fw_xfer *));
-void fw_asy_callback_free __P((struct fw_xfer *));
-struct fw_device *fw_noderesolve_nodeid __P((struct firewire_comm *, int));
-struct fw_device *fw_noderesolve_eui64 __P((struct firewire_comm *, struct fw_eui64 *));
-struct fw_bind *fw_bindlookup __P((struct firewire_comm *, u_int16_t, u_int32_t));
-void fw_drain_txq __P((struct firewire_comm *));
-int fwdev_makedev __P((struct firewire_softc *));
-int fwdev_destroydev __P((struct firewire_softc *));
-void fwdev_clone __P((void *, char *, int, dev_t *));
+void fw_sidrcv (struct firewire_comm *, u_int32_t *, u_int);
+void fw_rcv (struct fw_rcv_buf *);
+void fw_xfer_unload ( struct fw_xfer*);
+void fw_xfer_free_buf ( struct fw_xfer*);
+void fw_xfer_free ( struct fw_xfer*);
+struct fw_xfer *fw_xfer_alloc (struct malloc_type *);
+struct fw_xfer *fw_xfer_alloc_buf (struct malloc_type *, int, int);
+void fw_init (struct firewire_comm *);
+int fw_tbuf_update (struct firewire_comm *, int, int);
+int fw_rbuf_update (struct firewire_comm *, int, int);
+void fw_asybusy (struct fw_xfer *);
+int fw_bindadd (struct firewire_comm *, struct fw_bind *);
+int fw_bindremove (struct firewire_comm *, struct fw_bind *);
+int fw_asyreq (struct firewire_comm *, int, struct fw_xfer*);
+void fw_busreset (struct firewire_comm *);
+u_int16_t fw_crc16 (u_int32_t *, u_int32_t);
+void fw_xfer_timeout (void *);
+void fw_xfer_done (struct fw_xfer *);
+void fw_asy_callback (struct fw_xfer *);
+void fw_asy_callback_free (struct fw_xfer *);
+struct fw_device *fw_noderesolve_nodeid (struct firewire_comm *, int);
+struct fw_device *fw_noderesolve_eui64 (struct firewire_comm *, struct fw_eui64 *);
+struct fw_bind *fw_bindlookup (struct firewire_comm *, u_int16_t, u_int32_t);
+void fw_drain_txq (struct firewire_comm *);
+int fwdev_makedev (struct firewire_softc *);
+int fwdev_destroydev (struct firewire_softc *);
+void fwdev_clone (void *, char *, int, dev_t *);
 
 extern int firewire_debug;
 extern devclass_t firewire_devclass;
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 6f63b54..a5bc997 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -113,37 +113,37 @@ static struct tcode_info tinfo[] = {
 #define OWRITE(sc, r, x) bus_space_write_4((sc)->bst, (sc)->bsh, (r), (x))
 #define OREAD(sc, r) bus_space_read_4((sc)->bst, (sc)->bsh, (r))
 
-static void fwohci_ibr __P((struct firewire_comm *));
-static void fwohci_db_init __P((struct fwohci_softc *, struct fwohci_dbch *));
-static void fwohci_db_free __P((struct fwohci_dbch *));
-static void fwohci_arcv __P((struct fwohci_softc *, struct fwohci_dbch *, int));
-static void fwohci_txd __P((struct fwohci_softc *, struct fwohci_dbch *));
-static void fwohci_start_atq __P((struct firewire_comm *));
-static void fwohci_start_ats __P((struct firewire_comm *));
-static void fwohci_start __P((struct fwohci_softc *, struct fwohci_dbch *));
-static u_int32_t fwphy_wrdata __P(( struct fwohci_softc *, u_int32_t, u_int32_t));
-static u_int32_t fwphy_rddata __P(( struct fwohci_softc *, u_int32_t));
-static int fwohci_rx_enable __P((struct fwohci_softc *, struct fwohci_dbch *));
-static int fwohci_tx_enable __P((struct fwohci_softc *, struct fwohci_dbch *));
-static int fwohci_irx_enable __P((struct firewire_comm *, int));
-static int fwohci_irx_disable __P((struct firewire_comm *, int));
+static void fwohci_ibr (struct firewire_comm *);
+static void fwohci_db_init (struct fwohci_softc *, struct fwohci_dbch *);
+static void fwohci_db_free (struct fwohci_dbch *);
+static void fwohci_arcv (struct fwohci_softc *, struct fwohci_dbch *, int);
+static void fwohci_txd (struct fwohci_softc *, struct fwohci_dbch *);
+static void fwohci_start_atq (struct firewire_comm *);
+static void fwohci_start_ats (struct firewire_comm *);
+static void fwohci_start (struct fwohci_softc *, struct fwohci_dbch *);
+static u_int32_t fwphy_wrdata ( struct fwohci_softc *, u_int32_t, u_int32_t);
+static u_int32_t fwphy_rddata ( struct fwohci_softc *, u_int32_t);
+static int fwohci_rx_enable (struct fwohci_softc *, struct fwohci_dbch *);
+static int fwohci_tx_enable (struct fwohci_softc *, struct fwohci_dbch *);
+static int fwohci_irx_enable (struct firewire_comm *, int);
+static int fwohci_irx_disable (struct firewire_comm *, int);
 #if BYTE_ORDER == BIG_ENDIAN
-static void fwohci_irx_post __P((struct firewire_comm *, u_int32_t *));
-#endif
-static int fwohci_itxbuf_enable __P((struct firewire_comm *, int));
-static int fwohci_itx_disable __P((struct firewire_comm *, int));
-static void fwohci_timeout __P((void *));
-static void fwohci_set_intr __P((struct firewire_comm *, int));
-
-static int fwohci_add_rx_buf __P((struct fwohci_dbch *, struct fwohcidb_tr *, int, struct fwdma_alloc *));
-static int fwohci_add_tx_buf __P((struct fwohci_dbch *, struct fwohcidb_tr *, int));
-static void	dump_db __P((struct fwohci_softc *, u_int32_t));
-static void 	print_db __P((struct fwohcidb_tr *, struct fwohcidb *, u_int32_t , u_int32_t));
-static void	dump_dma __P((struct fwohci_softc *, u_int32_t));
-static u_int32_t fwohci_cyctimer __P((struct firewire_comm *));
-static void fwohci_rbuf_update __P((struct fwohci_softc *, int));
-static void fwohci_tbuf_update __P((struct fwohci_softc *, int));
-void fwohci_txbufdb __P((struct fwohci_softc *, int , struct fw_bulkxfer *));
+static void fwohci_irx_post (struct firewire_comm *, u_int32_t *);
+#endif
+static int fwohci_itxbuf_enable (struct firewire_comm *, int);
+static int fwohci_itx_disable (struct firewire_comm *, int);
+static void fwohci_timeout (void *);
+static void fwohci_set_intr (struct firewire_comm *, int);
+
+static int fwohci_add_rx_buf (struct fwohci_dbch *, struct fwohcidb_tr *, int, struct fwdma_alloc *);
+static int fwohci_add_tx_buf (struct fwohci_dbch *, struct fwohcidb_tr *, int);
+static void	dump_db (struct fwohci_softc *, u_int32_t);
+static void 	print_db (struct fwohcidb_tr *, struct fwohcidb *, u_int32_t , u_int32_t);
+static void	dump_dma (struct fwohci_softc *, u_int32_t);
+static u_int32_t fwohci_cyctimer (struct firewire_comm *);
+static void fwohci_rbuf_update (struct fwohci_softc *, int);
+static void fwohci_tbuf_update (struct fwohci_softc *, int);
+void fwohci_txbufdb (struct fwohci_softc *, int , struct fw_bulkxfer *);
 #if FWOHCI_TASKQUEUE
 static void fwohci_complete(void *, int);
 #endif
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 9a9fbd8..76c7552 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -83,10 +83,10 @@ typedef struct fwohci_softc {
 #endif
 } fwohci_softc_t;
 
-void fwohci_intr __P((void *arg));
-int fwohci_init __P((struct fwohci_softc *, device_t));
-void fwohci_poll __P((struct firewire_comm *, int, int));
-void fwohci_reset __P((struct fwohci_softc *, device_t));
-int fwohci_detach __P((struct fwohci_softc *, device_t));
-int fwohci_resume __P((struct fwohci_softc *, device_t));
-int fwohci_stop __P((struct fwohci_softc *, device_t dev));
+void fwohci_intr (void *arg);
+int fwohci_init (struct fwohci_softc *, device_t);
+void fwohci_poll (struct firewire_comm *, int, int);
+void fwohci_reset (struct fwohci_softc *, device_t);
+int fwohci_detach (struct fwohci_softc *, device_t);
+int fwohci_resume (struct fwohci_softc *, device_t);
+int fwohci_stop (struct fwohci_softc *, device_t dev);
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index c8887bb..cd546df 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -62,13 +62,13 @@
 #define TX_MAX_QUEUE	(FWMAXQUEUE - 1)
 
 /* network interface */
-static void fwe_start __P((struct ifnet *));
-static int fwe_ioctl __P((struct ifnet *, u_long, caddr_t));
-static void fwe_init __P((void *));
+static void fwe_start (struct ifnet *);
+static int fwe_ioctl (struct ifnet *, u_long, caddr_t);
+static void fwe_init (void *);
 
-static void fwe_output_callback __P((struct fw_xfer *));
-static void fwe_as_output __P((struct fwe_softc *, struct ifnet *));
-static void fwe_as_input __P((struct fw_xferq *));
+static void fwe_output_callback (struct fw_xfer *);
+static void fwe_as_output (struct fwe_softc *, struct ifnet *);
+static void fwe_as_input (struct fw_xferq *);
 
 static int fwedebug = 0;
 static int stream_ch = 1;
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 3b02699..12f7113 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -220,28 +220,28 @@ struct sbp_softc {
 	int flags;
 };
 
-static void sbp_post_explore __P((void *));
-static void sbp_recv __P((struct fw_xfer *));
-static void sbp_mgm_callback __P((struct fw_xfer *));
+static void sbp_post_explore (void *);
+static void sbp_recv (struct fw_xfer *);
+static void sbp_mgm_callback (struct fw_xfer *);
 #if 0
-static void sbp_cmd_callback __P((struct fw_xfer *));
+static void sbp_cmd_callback (struct fw_xfer *);
 #endif
-static void sbp_orb_pointer __P((struct sbp_dev *, struct sbp_ocb *));
-static void sbp_execute_ocb __P((void *,  bus_dma_segment_t *, int, int));
-static void sbp_free_ocb __P((struct sbp_dev *, struct sbp_ocb *));
-static void sbp_abort_ocb __P((struct sbp_ocb *, int));
-static void sbp_abort_all_ocbs __P((struct sbp_dev *, int));
-static struct fw_xfer * sbp_write_cmd __P((struct sbp_dev *, int, int));
-static struct sbp_ocb * sbp_get_ocb __P((struct sbp_dev *));
-static struct sbp_ocb * sbp_enqueue_ocb __P((struct sbp_dev *, struct sbp_ocb *));
-static struct sbp_ocb * sbp_dequeue_ocb __P((struct sbp_dev *, struct sbp_status *));
+static void sbp_orb_pointer (struct sbp_dev *, struct sbp_ocb *);
+static void sbp_execute_ocb (void *,  bus_dma_segment_t *, int, int);
+static void sbp_free_ocb (struct sbp_dev *, struct sbp_ocb *);
+static void sbp_abort_ocb (struct sbp_ocb *, int);
+static void sbp_abort_all_ocbs (struct sbp_dev *, int);
+static struct fw_xfer * sbp_write_cmd (struct sbp_dev *, int, int);
+static struct sbp_ocb * sbp_get_ocb (struct sbp_dev *);
+static struct sbp_ocb * sbp_enqueue_ocb (struct sbp_dev *, struct sbp_ocb *);
+static struct sbp_ocb * sbp_dequeue_ocb (struct sbp_dev *, struct sbp_status *);
 static void sbp_cam_detach_sdev(struct sbp_dev *);
 static void sbp_free_sdev(struct sbp_dev *);
-static void sbp_cam_detach_target __P((struct sbp_target *));
-static void sbp_free_target __P((struct sbp_target *));
-static void sbp_mgm_timeout __P((void *arg));
-static void sbp_timeout __P((void *arg));
-static void sbp_mgm_orb __P((struct sbp_dev *, int, struct sbp_ocb *));
+static void sbp_cam_detach_target (struct sbp_target *);
+static void sbp_free_target (struct sbp_target *);
+static void sbp_mgm_timeout (void *arg);
+static void sbp_timeout (void *arg);
+static void sbp_mgm_orb (struct sbp_dev *, int, struct sbp_ocb *);
 
 MALLOC_DEFINE(M_SBP, "sbp", "SBP-II/FireWire");