First round of __P removal in sys

4 files changed, 97 insertions, 98 deletions

diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index ef2bd5f9387..cd7e27fe9b2 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_netbsdkintf.c,v 1.8 2001/07/09 17:20:07 fgsch Exp $	*/
+/*	$OpenBSD: rf_netbsdkintf.c,v 1.9 2002/03/14 01:27:01 millert Exp $	*/
 /*	$NetBSD: rf_netbsdkintf.c,v 1.93 2000/07/14 15:26:29 oster Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -180,17 +180,17 @@ static void InitBP(struct buf * bp, struct vnode *, unsigned rw_flag,
 		   RF_SectorCount_t numSect, caddr_t buf,
 		   void (*cbFunc) (struct buf *), void *cbArg, 
 		   int logBytesPerSector, struct proc * b_proc);
-static void raidinit __P((RF_Raid_t *));
-
-void raidattach __P((int));
-int raidsize __P((dev_t));
-int raidopen __P((dev_t, int, int, struct proc *));
-int raidclose __P((dev_t, int, int, struct proc *));
-int raidioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int raidwrite __P((dev_t, struct uio *, int));
-int raidread __P((dev_t, struct uio *, int));
-void raidstrategy __P((struct buf *));
-int raiddump __P((dev_t, daddr_t, caddr_t, size_t));
+static void raidinit(RF_Raid_t *);
+
+void raidattach(int);
+int raidsize(dev_t);
+int raidopen(dev_t, int, int, struct proc *);
+int raidclose(dev_t, int, int, struct proc *);
+int raidioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int raidwrite(dev_t, struct uio *, int);
+int raidread(dev_t, struct uio *, int);
+void raidstrategy(struct buf *);
+int raiddump(dev_t, daddr_t, caddr_t, size_t);
 
 /*
  * Pilfered from ccd.c
@@ -257,39 +257,39 @@ int numraid = 0;
 /* declared here, and made public, for the benefit of KVM stuff.. */
 struct raid_softc *raid_softc;
 
-static void raidgetdefaultlabel __P((RF_Raid_t *, struct raid_softc *, 
-				     struct disklabel *));
-static void raidgetdisklabel __P((dev_t));
-static void raidmakedisklabel __P((struct raid_softc *));
+static void raidgetdefaultlabel(RF_Raid_t *, struct raid_softc *, 
+				     struct disklabel *);
+static void raidgetdisklabel(dev_t);
+static void raidmakedisklabel(struct raid_softc *);
 
-static int raidlock __P((struct raid_softc *));
-static void raidunlock __P((struct raid_softc *));
+static int raidlock(struct raid_softc *);
+static void raidunlock(struct raid_softc *);
 
-static void rf_markalldirty __P((RF_Raid_t *));
-void rf_mountroot_hook __P((struct device *));
+static void rf_markalldirty(RF_Raid_t *);
+void rf_mountroot_hook(struct device *);
 
 struct device *raidrootdev;
 
-void rf_ReconThread __P((struct rf_recon_req *));
+void rf_ReconThread(struct rf_recon_req *);
 /* XXX what I want is: */
-/*void rf_ReconThread __P((RF_Raid_t *raidPtr));  */
-void rf_RewriteParityThread __P((RF_Raid_t *raidPtr));
-void rf_CopybackThread __P((RF_Raid_t *raidPtr));
-void rf_ReconstructInPlaceThread __P((struct rf_recon_req *));
-void rf_buildroothack __P((void *));
-
-RF_AutoConfig_t *rf_find_raid_components __P((void));
-RF_ConfigSet_t *rf_create_auto_sets __P((RF_AutoConfig_t *));
-static int rf_does_it_fit __P((RF_ConfigSet_t *,RF_AutoConfig_t *));
-static int rf_reasonable_label __P((RF_ComponentLabel_t *));
-void rf_create_configuration __P((RF_AutoConfig_t *,RF_Config_t *,
-				  RF_Raid_t *));
-int rf_set_autoconfig __P((RF_Raid_t *, int));
-int rf_set_rootpartition __P((RF_Raid_t *, int));
-void rf_release_all_vps __P((RF_ConfigSet_t *));
-void rf_cleanup_config_set __P((RF_ConfigSet_t *));
-int rf_have_enough_components __P((RF_ConfigSet_t *));
-int rf_auto_config_set __P((RF_ConfigSet_t *, int *));
+/*void rf_ReconThread(RF_Raid_t *raidPtr);  */
+void rf_RewriteParityThread(RF_Raid_t *raidPtr);
+void rf_CopybackThread(RF_Raid_t *raidPtr);
+void rf_ReconstructInPlaceThread(struct rf_recon_req *);
+void rf_buildroothack(void *);
+
+RF_AutoConfig_t *rf_find_raid_components(void);
+RF_ConfigSet_t *rf_create_auto_sets(RF_AutoConfig_t *);
+static int rf_does_it_fit(RF_ConfigSet_t *,RF_AutoConfig_t *);
+static int rf_reasonable_label(RF_ComponentLabel_t *);
+void rf_create_configuration(RF_AutoConfig_t *,RF_Config_t *,
+				  RF_Raid_t *);
+int rf_set_autoconfig(RF_Raid_t *, int);
+int rf_set_rootpartition(RF_Raid_t *, int);
+void rf_release_all_vps(RF_ConfigSet_t *);
+void rf_cleanup_config_set(RF_ConfigSet_t *);
+int rf_have_enough_components(RF_ConfigSet_t *);
+int rf_auto_config_set(RF_ConfigSet_t *, int *);
 
 static int raidautoconfig = 0; /* Debugging, mostly.  Set to 0 to not
 				  allow autoconfig to take place.
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 8321535eb73..73db0810d60 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.14 2002/03/06 11:28:27 tdeval Exp $	*/
+/* $OpenBSD: rf_openbsdkintf.c,v 1.15 2002/03/14 01:27:01 millert Exp $	*/
 /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -172,21 +172,21 @@ static RF_SparetWait_t *rf_sparet_wait_queue;
 static RF_SparetWait_t *rf_sparet_resp_queue;
 
 /* prototypes */
-void	rf_KernelWakeupFunc __P((struct buf *));
+void	rf_KernelWakeupFunc(struct buf *);
 void	rf_InitBP __P((struct buf *, struct vnode *, unsigned, dev_t,
 	    RF_SectorNum_t, RF_SectorCount_t, caddr_t, void (*)(struct buf *),
 	    void *, int, struct proc *));
-void raidinit __P((RF_Raid_t *));
-
-void	raidattach __P((int));
-int	raidsize __P((dev_t));
-int	raidopen __P((dev_t, int, int, struct proc *));
-int	raidclose __P((dev_t, int, int, struct proc *));
-int	raidioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int	raidwrite __P((dev_t, struct uio *, int));
-int	raidread __P((dev_t, struct uio *, int));
-void	raidstrategy __P((struct buf *));
-int	raiddump __P((dev_t, daddr_t, caddr_t, size_t));
+void raidinit(RF_Raid_t *);
+
+void	raidattach(int);
+int	raidsize(dev_t);
+int	raidopen(dev_t, int, int, struct proc *);
+int	raidclose(dev_t, int, int, struct proc *);
+int	raidioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int	raidwrite(dev_t, struct uio *, int);
+int	raidread(dev_t, struct uio *, int);
+void	raidstrategy(struct buf *);
+int	raiddump(dev_t, daddr_t, caddr_t, size_t);
 
 /*
  * Pilfered from ccd.c
@@ -239,11 +239,11 @@ int numraid = 0;
  * into the device tree.  This is needed by some archs that look for
  * bootable devices in there.
  */
-int	rf_probe	__P((struct device *, void *, void *));
-void	rf_attach	__P((struct device *, struct device *, void *));
-int	rf_detach	__P((struct device *, int));
-int	rf_activate	__P((struct device *, enum devact));
-void	rf_zeroref	__P((struct device *));
+int	rf_probe(struct device *, void *, void *);
+void	rf_attach(struct device *, struct device *, void *);
+int	rf_detach(struct device *, int);
+int	rf_activate(struct device *, enum devact);
+void	rf_zeroref(struct device *);
 
 struct cfattach raid_ca = {
 	sizeof(struct raid_softc), rf_probe, rf_attach,
@@ -279,43 +279,42 @@ struct raid_softc *raid_softc;
 struct raid_softc **raid_scPtrs;
 
 void	rf_shutdown_hook(RF_ThreadArg_t);
-void	raidgetdefaultlabel
-	     __P((RF_Raid_t *, struct raid_softc *, struct disklabel *));
-void	raidgetdisklabel __P((dev_t));
-void	raidmakedisklabel __P((struct raid_softc *));
+void	raidgetdefaultlabel(RF_Raid_t *, struct raid_softc *, struct disklabel *);
+void	raidgetdisklabel(dev_t);
+void	raidmakedisklabel(struct raid_softc *);
 
-int	raidlock __P((struct raid_softc *));
-void	raidunlock __P((struct raid_softc *));
+int	raidlock(struct raid_softc *);
+void	raidunlock(struct raid_softc *);
 
-void	rf_markalldirty __P((RF_Raid_t *));
+void	rf_markalldirty(RF_Raid_t *);
 
 struct device *raidrootdev;
 
-int findblkmajor __P((struct device *dv));
-char *findblkname __P((int));
+int findblkmajor(struct device *dv);
+char *findblkname(int);
 
-void rf_ReconThread __P((struct rf_recon_req *));
+void rf_ReconThread(struct rf_recon_req *);
 /* XXX what I want is: */
-/*void rf_ReconThread __P((RF_Raid_t *raidPtr));  */
-void rf_RewriteParityThread __P((RF_Raid_t *raidPtr));
-void rf_CopybackThread __P((RF_Raid_t *raidPtr));
-void rf_ReconstructInPlaceThread __P((struct rf_recon_req *));
+/*void rf_ReconThread(RF_Raid_t *raidPtr);  */
+void rf_RewriteParityThread(RF_Raid_t *raidPtr);
+void rf_CopybackThread(RF_Raid_t *raidPtr);
+void rf_ReconstructInPlaceThread(struct rf_recon_req *);
 #ifdef RAID_AUTOCONFIG
-void rf_buildroothack __P((void *));
-int rf_reasonable_label __P((RF_ComponentLabel_t *));
+void rf_buildroothack(void *);
+int rf_reasonable_label(RF_ComponentLabel_t *);
 #endif
 
-RF_AutoConfig_t *rf_find_raid_components __P((void));
-RF_ConfigSet_t *rf_create_auto_sets __P((RF_AutoConfig_t *));
-int rf_does_it_fit __P((RF_ConfigSet_t *,RF_AutoConfig_t *));
-void rf_create_configuration __P((RF_AutoConfig_t *,RF_Config_t *,
-				  RF_Raid_t *));
-int rf_set_autoconfig __P((RF_Raid_t *, int));
-int rf_set_rootpartition __P((RF_Raid_t *, int));
-void rf_release_all_vps __P((RF_ConfigSet_t *));
-void rf_cleanup_config_set __P((RF_ConfigSet_t *));
-int rf_have_enough_components __P((RF_ConfigSet_t *));
-int rf_auto_config_set __P((RF_ConfigSet_t *, int *));
+RF_AutoConfig_t *rf_find_raid_components(void);
+RF_ConfigSet_t *rf_create_auto_sets(RF_AutoConfig_t *);
+int rf_does_it_fit(RF_ConfigSet_t *,RF_AutoConfig_t *);
+void rf_create_configuration(RF_AutoConfig_t *,RF_Config_t *,
+				  RF_Raid_t *);
+int rf_set_autoconfig(RF_Raid_t *, int);
+int rf_set_rootpartition(RF_Raid_t *, int);
+void rf_release_all_vps(RF_ConfigSet_t *);
+void rf_cleanup_config_set(RF_ConfigSet_t *);
+int rf_have_enough_components(RF_ConfigSet_t *);
+int rf_auto_config_set(RF_ConfigSet_t *, int *);
 
 #ifdef RAID_AUTOCONFIG
 static int raidautoconfig = 0; /* Debugging, mostly.  Set to 0 to not
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 7425bb612de..b5cd80a7665 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_reconstruct.c,v 1.10 2001/01/02 09:06:26 peter Exp $	*/
+/*	$OpenBSD: rf_reconstruct.c,v 1.11 2002/03/14 01:27:02 millert Exp $	*/
 /*	$NetBSD: rf_reconstruct.c,v 1.26 2000/06/04 02:05:13 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -83,26 +83,26 @@ static RF_FreeList_t *rf_recond_freelist;
 #define RF_MAX_FREE_RECOND  4
 #define RF_RECOND_INC       1
 
-RF_RaidReconDesc_t *rf_AllocRaidReconDesc __P((RF_Raid_t *, RF_RowCol_t, RF_RowCol_t, RF_RaidDisk_t *, int, RF_RowCol_t, RF_RowCol_t));
-int rf_ProcessReconEvent __P((RF_Raid_t *, RF_RowCol_t, RF_ReconEvent_t *));
-int rf_IssueNextReadRequest __P((RF_Raid_t *, RF_RowCol_t, RF_RowCol_t));
-int rf_TryToRead __P((RF_Raid_t *, RF_RowCol_t, RF_RowCol_t));
-int rf_ComputePSDiskOffsets __P((RF_Raid_t *, RF_StripeNum_t, RF_RowCol_t, RF_RowCol_t, RF_SectorNum_t *, RF_SectorNum_t *, RF_RowCol_t *, RF_RowCol_t *, RF_SectorNum_t *));
+RF_RaidReconDesc_t *rf_AllocRaidReconDesc(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t, RF_RaidDisk_t *, int, RF_RowCol_t, RF_RowCol_t);
+int rf_ProcessReconEvent(RF_Raid_t *, RF_RowCol_t, RF_ReconEvent_t *);
+int rf_IssueNextReadRequest(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
+int rf_TryToRead(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
+int rf_ComputePSDiskOffsets(RF_Raid_t *, RF_StripeNum_t, RF_RowCol_t, RF_RowCol_t, RF_SectorNum_t *, RF_SectorNum_t *, RF_RowCol_t *, RF_RowCol_t *, RF_SectorNum_t *);
 int rf_ReconReadDoneProc(void *, int);
 int rf_ReconWriteDoneProc(void *, int);
 void rf_CheckForNewMinHeadSep(RF_Raid_t *, RF_RowCol_t, RF_HeadSepLimit_t);
 int rf_CheckHeadSeparation(RF_Raid_t *, RF_PerDiskReconCtrl_t *, RF_RowCol_t, RF_RowCol_t, RF_HeadSepLimit_t, RF_ReconUnitNum_t);
-void rf_ForceReconReadDoneProc __P((void *, int));
-void rf_ShutdownReconstruction __P((void *));
+void rf_ForceReconReadDoneProc(void *, int);
+void rf_ShutdownReconstruction(void *);
 
 /*
  * these functions are inlined on gcc. If they are used more than
  * once, it is strongly advised to un-line them
  */
-void rf_FreeReconDesc __P((RF_RaidReconDesc_t *));
-int rf_IssueNextWriteRequest __P((RF_Raid_t *, RF_RowCol_t));
-int rf_CheckForcedOrBlockedReconstruction __P((RF_Raid_t *, RF_ReconParityStripeStatus_t *, RF_PerDiskReconCtrl_t *, RF_RowCol_t, RF_RowCol_t, RF_StripeNum_t, RF_ReconUnitNum_t));
-void rf_SignalReconDone __P((RF_Raid_t *));
+void rf_FreeReconDesc(RF_RaidReconDesc_t *);
+int rf_IssueNextWriteRequest(RF_Raid_t *, RF_RowCol_t);
+int rf_CheckForcedOrBlockedReconstruction(RF_Raid_t *, RF_ReconParityStripeStatus_t *, RF_PerDiskReconCtrl_t *, RF_RowCol_t, RF_RowCol_t, RF_StripeNum_t, RF_ReconUnitNum_t);
+void rf_SignalReconDone(RF_Raid_t *);
 
 struct RF_ReconDoneProc_s {
 	void    (*proc) (RF_Raid_t *, void *);
diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h
index a54ad90c223..046d6428bd5 100644
--- a/sys/dev/raidframe/rf_threadstuff.h
+++ b/sys/dev/raidframe/rf_threadstuff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_threadstuff.h,v 1.6 2000/08/08 16:07:45 peter Exp $	*/
+/*	$OpenBSD: rf_threadstuff.h,v 1.7 2002/03/14 01:27:02 millert Exp $	*/
 /*	$NetBSD: rf_threadstuff.h,v 1.8 2000/06/11 03:35:38 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -95,7 +95,7 @@ typedef void *RF_ThreadArg_t;
 #define RF_SIGNAL_COND(_c_)            wakeup(&(_c_))
 #define RF_BROADCAST_COND(_c_)         wakeup(&(_c_))
 #define	RF_CREATE_THREAD(_handle_, _func_, _arg_, _name_) \
-	kthread_create((void (*) __P((void *)))(_func_), (void *)(_arg_), \
+	kthread_create((void (*)(void *))(_func_), (void *)(_arg_), \
 	    (struct proc **)&(_handle_), _name_)
 
 struct RF_ThreadGroup_s {