First round of __P removal in sys

4 files changed, 84 insertions, 96 deletions

diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index 6d7ab2c5729..a4fdc8649f4 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_disk.c,v 1.9 2001/12/05 03:04:38 hugh Exp $	*/
+/*	$OpenBSD: mscp_disk.c,v 1.10 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -100,23 +100,23 @@ struct ra_softc {
 
 #define rx_softc ra_softc
 
-void	rxattach __P((struct device *, struct device *, void *));
-int	rx_putonline __P((struct rx_softc *));
-void	rrmakelabel __P((struct disklabel *, long));
+void	rxattach(struct device *, struct device *, void *);
+int	rx_putonline(struct rx_softc *);
+void	rrmakelabel(struct disklabel *, long);
 
 #if NRA
 
-int	ramatch __P((struct device *, struct cfdata *, void *));
-void	raattach __P((struct device *, struct device *, void *));
-int	raopen __P((dev_t, int, int, struct proc *));
-int	raclose __P((dev_t, int, int, struct proc *));
-void	rastrategy __P((struct buf *));
-int	raread __P((dev_t, struct uio *));
-int	rawrite __P((dev_t, struct uio *));
-int	raioctl __P((dev_t, int, caddr_t, int, struct proc *));
-int	radump __P((dev_t, daddr_t, caddr_t, size_t));
-int	rasize __P((dev_t));
-int	ra_putonline __P((struct ra_softc *));
+int	ramatch(struct device *, struct cfdata *, void *);
+void	raattach(struct device *, struct device *, void *);
+int	raopen(dev_t, int, int, struct proc *);
+int	raclose(dev_t, int, int, struct proc *);
+void	rastrategy(struct buf *);
+int	raread(dev_t, struct uio *);
+int	rawrite(dev_t, struct uio *);
+int	raioctl(dev_t, int, caddr_t, int, struct proc *);
+int	radump(dev_t, daddr_t, caddr_t, size_t);
+int	rasize(dev_t);
+int	ra_putonline(struct ra_softc *);
 
 struct	cfattach ra_ca = {
 	sizeof(struct ra_softc), (cfmatch_t)ramatch, rxattach
@@ -528,15 +528,15 @@ int ra_getdev(adaptor, controller, unit, uname)
 
 #if NRX
 
-int	rxmatch __P((struct device *, struct cfdata *, void *));
-int	rxopen __P((dev_t, int, int, struct proc *));
-int	rxclose __P((dev_t, int, int, struct proc *));
-void	rxstrategy __P((struct buf *));
-int	rxread __P((dev_t, struct uio *));
-int	rxwrite __P((dev_t, struct uio *));
-int	rxioctl __P((dev_t, int, caddr_t, int, struct proc *));
-int	rxdump __P((dev_t, daddr_t, caddr_t, size_t));
-int	rxsize __P((dev_t));
+int	rxmatch(struct device *, struct cfdata *, void *);
+int	rxopen(dev_t, int, int, struct proc *);
+int	rxclose(dev_t, int, int, struct proc *);
+void	rxstrategy(struct buf *);
+int	rxread(dev_t, struct uio *);
+int	rxwrite(dev_t, struct uio *);
+int	rxioctl(dev_t, int, caddr_t, int, struct proc *);
+int	rxdump(dev_t, daddr_t, caddr_t, size_t);
+int	rxsize(dev_t);
 
 struct	cfattach rx_ca = {
 	sizeof(struct rx_softc), (cfmatch_t)rxmatch, rxattach
@@ -820,14 +820,14 @@ rxsize(dev)
 
 #endif /* NRX */
 
-void	rrdgram __P((struct device *, struct mscp *, struct mscp_softc *));
-void	rriodone __P((struct device *, struct buf *));
-int	rronline __P((struct device *, struct mscp *));
-int	rrgotstatus __P((struct device *, struct mscp *));
-void	rrreplace __P((struct device *, struct mscp *));
-int	rrioerror __P((struct device *, struct mscp *, struct buf *));
-void	rrfillin __P((struct buf *, struct mscp *));
-void	rrbb __P((struct device *, struct mscp *, struct buf *));
+void	rrdgram(struct device *, struct mscp *, struct mscp_softc *);
+void	rriodone(struct device *, struct buf *);
+int	rronline(struct device *, struct mscp *);
+int	rrgotstatus(struct device *, struct mscp *);
+void	rrreplace(struct device *, struct mscp *);
+int	rrioerror(struct device *, struct mscp *, struct buf *);
+void	rrfillin(struct buf *, struct mscp *);
+void	rrbb(struct device *, struct mscp *, struct buf *);
 
 
 struct	mscp_device ra_device = {
diff --git a/sys/arch/vax/mscp/mscp_subr.c b/sys/arch/vax/mscp/mscp_subr.c
index 15f8a4a9d22..00c4a798cdd 100644
--- a/sys/arch/vax/mscp/mscp_subr.c
+++ b/sys/arch/vax/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_subr.c,v 1.4 2001/12/05 03:04:38 hugh Exp $	*/
+/*	$OpenBSD: mscp_subr.c,v 1.5 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: mscp_subr.c,v 1.18 2001/11/13 07:38:28 lukem Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -63,12 +63,12 @@
 
 #define b_forw	b_hash.le_next
 
-int	mscp_match __P((struct device *, struct cfdata *, void *));
-void	mscp_attach __P((struct device *, struct device *, void *));
-void	mscp_start __P((struct	mscp_softc *));
-int	mscp_init __P((struct  mscp_softc *));
-void	mscp_initds __P((struct mscp_softc *));
-int	mscp_waitstep __P((struct mscp_softc *, int, int));
+int	mscp_match(struct device *, struct cfdata *, void *);
+void	mscp_attach(struct device *, struct device *, void *);
+void	mscp_start(struct	mscp_softc *);
+int	mscp_init(struct  mscp_softc *);
+void	mscp_initds(struct mscp_softc *);
+int	mscp_waitstep(struct mscp_softc *, int, int);
 
 struct	cfattach mscpbus_ca = {
 	sizeof(struct mscp_softc), (cfmatch_t)mscp_match, mscp_attach
diff --git a/sys/arch/vax/mscp/mscp_tape.c b/sys/arch/vax/mscp/mscp_tape.c
index bdc5bf58a1d..4b88d804d67 100644
--- a/sys/arch/vax/mscp/mscp_tape.c
+++ b/sys/arch/vax/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_tape.c,v 1.6 2001/12/05 03:04:38 hugh Exp $ */
+/*	$OpenBSD: mscp_tape.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */
 /*	$NetBSD: mscp_tape.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -77,24 +77,24 @@ struct mt_softc {
 #define MT_OFFLINE	0
 #define MT_ONLINE	1
 
-int	mtmatch __P((struct device *, struct cfdata *, void *));
-void	mtattach __P((struct device *, struct device *, void *));
-void	mtdgram __P((struct device *, struct mscp *, struct mscp_softc *));
-void	mtiodone __P((struct device *, struct buf *));
-int	mtonline __P((struct device *, struct mscp *));
-int	mtgotstatus __P((struct device *, struct mscp *));
-int	mtioerror __P((struct device *, struct mscp *, struct buf *));
-void	mtfillin __P((struct buf *, struct mscp *));
-int	mtopen __P((dev_t, int, int, struct proc *));
-int	mtclose __P((dev_t, int, int, struct proc *));
-void	mtstrategy __P((struct buf *));
-int	mtread __P((dev_t, struct uio *));
-int	mtwrite __P((dev_t, struct uio *));
-int	mtioctl __P((dev_t, int, caddr_t, int, struct proc *));
-int	mtdump __P((dev_t, daddr_t, caddr_t, size_t));
-int	mtcmd __P((struct mt_softc *, int, int, int));
-void	mtcmddone __P((struct device *, struct mscp *));
-int	mt_putonline __P((struct mt_softc *));
+int	mtmatch(struct device *, struct cfdata *, void *);
+void	mtattach(struct device *, struct device *, void *);
+void	mtdgram(struct device *, struct mscp *, struct mscp_softc *);
+void	mtiodone(struct device *, struct buf *);
+int	mtonline(struct device *, struct mscp *);
+int	mtgotstatus(struct device *, struct mscp *);
+int	mtioerror(struct device *, struct mscp *, struct buf *);
+void	mtfillin(struct buf *, struct mscp *);
+int	mtopen(dev_t, int, int, struct proc *);
+int	mtclose(dev_t, int, int, struct proc *);
+void	mtstrategy(struct buf *);
+int	mtread(dev_t, struct uio *);
+int	mtwrite(dev_t, struct uio *);
+int	mtioctl(dev_t, int, caddr_t, int, struct proc *);
+int	mtdump(dev_t, daddr_t, caddr_t, size_t);
+int	mtcmd(struct mt_softc *, int, int, int);
+void	mtcmddone(struct device *, struct mscp *);
+int	mt_putonline(struct mt_softc *);
 
 struct	mscp_device mt_device = {
 	mtdgram,
diff --git a/sys/arch/vax/mscp/mscpvar.h b/sys/arch/vax/mscp/mscpvar.h
index 0e0654be62b..e51901ec482 100644
--- a/sys/arch/vax/mscp/mscpvar.h
+++ b/sys/arch/vax/mscp/mscpvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscpvar.h,v 1.3 2000/04/27 03:14:46 bjc Exp $	*/
+/*	$OpenBSD: mscpvar.h,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -81,35 +81,23 @@ struct mscp_xi {
 };
 
 struct	mscp_ctlr {
-	void	(*mc_ctlrdone)		/* controller operation complete */
-	    __P((struct device *));
-	void	(*mc_go)		/* device-specific start routine */
-	    __P((struct device *, struct mscp_xi *));
-	void	(*mc_saerror)		/* ctlr error handling */
-	    __P((struct device *, int));
+	void	(*mc_ctlrdone)		/* controller operation complete */(struct device *);
+	void	(*mc_go)		/* device-specific start routine */(struct device *, struct mscp_xi *);
+	void	(*mc_saerror)		/* ctlr error handling */(struct device *, int);
 };
 
 struct mscp_softc;
 
 struct	mscp_device {
-	void	(*me_dgram)	/* error datagram */
-	    __P((struct device *, struct mscp *, struct mscp_softc *));
-	void	(*me_iodone)	/* normal I/O is done */
-	    __P((struct device *, struct buf *));
-	int	(*me_online)	/* drive on line */
-	    __P((struct device *, struct mscp *));
-	int	(*me_gotstatus) /* got unit status */
-	    __P((struct device *, struct mscp *));
-	void	(*me_replace)	/* replace done */
-	    __P((struct device *, struct mscp *));
-	int	(*me_ioerr)	/* read or write failed */
-	    __P((struct device *, struct mscp *, struct buf *));
-	void	(*me_bb)	/* B_BAD io done */
-	    __P((struct device *, struct mscp *, struct buf *));
-	void	(*me_fillin)	/* Fill in mscp info for this drive */
-	    __P((struct buf *,struct mscp *));
-	void	(*me_cmddone)	/* Non-data transfer operation is done */
-	    __P((struct device *, struct mscp *));
+	void	(*me_dgram)	/* error datagram */(struct device *, struct mscp *, struct mscp_softc *);
+	void	(*me_iodone)	/* normal I/O is done */(struct device *, struct buf *);
+	int	(*me_online)	/* drive on line */(struct device *, struct mscp *);
+	int	(*me_gotstatus) /* got unit status */(struct device *, struct mscp *);
+	void	(*me_replace)	/* replace done */(struct device *, struct mscp *);
+	int	(*me_ioerr)	/* read or write failed */(struct device *, struct mscp *, struct buf *);
+	void	(*me_bb)	/* B_BAD io done */(struct device *, struct mscp *, struct buf *);
+	void	(*me_fillin)	/* Fill in mscp info for this drive */(struct buf *,struct mscp *);
+	void	(*me_cmddone)	/* Non-data transfer operation is done */(struct device *, struct mscp *);
 };
 
 /*
@@ -236,16 +224,16 @@ struct mscp_softc {
 }
 
 /* Prototypes */
-struct	mscp *mscp_getcp __P((struct mscp_softc *, int));
-void	mscp_printevent __P((struct mscp *));
-void	mscp_go __P((struct mscp_softc *, struct mscp *, int));
-void	mscp_requeue __P((struct mscp_softc *));
-void	mscp_dorsp __P((struct mscp_softc *));
-int	mscp_decodeerror __P((char *, struct mscp *, struct mscp_softc *));
-int	mscp_print __P((void *, const char *));
-void	mscp_hexdump __P((struct mscp *));
-void	mscp_strategy __P((struct buf *, struct device *));
-void	mscp_printtype __P((int, int));
-int	mscp_waitstep __P((struct mscp_softc *, int, int));
-void	mscp_dgo __P((struct mscp_softc *, struct mscp_xi *));
-void	mscp_intr __P((struct mscp_softc *));
+struct	mscp *mscp_getcp(struct mscp_softc *, int);
+void	mscp_printevent(struct mscp *);
+void	mscp_go(struct mscp_softc *, struct mscp *, int);
+void	mscp_requeue(struct mscp_softc *);
+void	mscp_dorsp(struct mscp_softc *);
+int	mscp_decodeerror(char *, struct mscp *, struct mscp_softc *);
+int	mscp_print(void *, const char *);
+void	mscp_hexdump(struct mscp *);
+void	mscp_strategy(struct buf *, struct device *);
+void	mscp_printtype(int, int);
+int	mscp_waitstep(struct mscp_softc *, int, int);
+void	mscp_dgo(struct mscp_softc *, struct mscp_xi *);
+void	mscp_intr(struct mscp_softc *);