First round of __P removal in sys

4 files changed, 45 insertions, 45 deletions

diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 09e4b0832a1..ff58f631afd 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata_wdc.c,v 1.12 2001/11/28 19:49:36 csapuntz Exp $	*/
+/*      $OpenBSD: ata_wdc.c,v 1.13 2002/03/14 01:26:52 millert Exp $	*/
 /*	$NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $	*/
 
 /*
@@ -114,13 +114,13 @@ struct cfdriver wdc_cd = {
 };
 #endif
 
-void  wdc_ata_bio_start  __P((struct channel_softc *,struct wdc_xfer *));
-void  _wdc_ata_bio_start  __P((struct channel_softc *,struct wdc_xfer *));
-int   wdc_ata_bio_intr   __P((struct channel_softc *, struct wdc_xfer *, int));
-void  wdc_ata_bio_kill_xfer __P((struct channel_softc *,struct wdc_xfer *));
-void  wdc_ata_bio_done   __P((struct channel_softc *, struct wdc_xfer *)); 
-int   wdc_ata_ctrl_intr __P((struct channel_softc *, struct wdc_xfer *, int));
-int   wdc_ata_err __P((struct ata_drive_datas *, struct ata_bio *));
+void  wdc_ata_bio_start(struct channel_softc *,struct wdc_xfer *);
+void  _wdc_ata_bio_start(struct channel_softc *,struct wdc_xfer *);
+int   wdc_ata_bio_intr(struct channel_softc *, struct wdc_xfer *, int);
+void  wdc_ata_bio_kill_xfer(struct channel_softc *,struct wdc_xfer *);
+void  wdc_ata_bio_done(struct channel_softc *, struct wdc_xfer *); 
+int   wdc_ata_ctrl_intr(struct channel_softc *, struct wdc_xfer *, int);
+int   wdc_ata_err(struct ata_drive_datas *, struct ata_bio *);
 #define WDC_ATA_NOERR 0x00 /* Drive doesn't report an error */
 #define WDC_ATA_RECOV 0x01 /* There was a recovered error */
 #define WDC_ATA_ERR   0x02 /* Drive reports an error */
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 216893478f8..b8118fb74b2 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atavar.h,v 1.9 2001/09/20 17:02:31 mpech Exp $	*/
+/*	$OpenBSD: atavar.h,v 1.10 2002/03/14 01:26:52 millert Exp $	*/
 /*	$NetBSD: atavar.h,v 1.13 1999/03/10 13:11:43 bouyer Exp $	*/
 
 /*
@@ -153,34 +153,34 @@ struct wdc_command {
     int timeout;	 /* timeout (in ms) */
     void *data;          /* Data buffer address */
     int bcount;           /* number of bytes to transfer */
-    void (*callback) __P((void*)); /* command to call once command completed */
+    void (*callback)(void*); /* command to call once command completed */
     void *callback_arg;  /* argument passed to *callback() */
 };
 
 extern int at_poll;
 
-int wdc_exec_command __P((struct ata_drive_datas *, struct wdc_command*));
+int wdc_exec_command(struct ata_drive_datas *, struct wdc_command*);
 #define WDC_COMPLETE 0x01
 #define WDC_QUEUED   0x02
 #define WDC_TRY_AGAIN 0x03
 
-void wdc_probe_caps __P((struct ata_drive_datas*, struct ataparams *));
-void wdc_print_caps __P((struct ata_drive_datas*));
-int  wdc_downgrade_mode __P((struct ata_drive_datas*));
+void wdc_probe_caps(struct ata_drive_datas*, struct ataparams *);
+void wdc_print_caps(struct ata_drive_datas*);
+int  wdc_downgrade_mode(struct ata_drive_datas*);
 
-void wdc_reset_channel __P((struct ata_drive_datas *));
+void wdc_reset_channel(struct ata_drive_datas *);
 
-int wdc_ata_addref __P((struct ata_drive_datas *));
-void wdc_ata_delref __P((struct ata_drive_datas *));
-void wdc_ata_kill_pending __P((struct ata_drive_datas *));
+int wdc_ata_addref(struct ata_drive_datas *);
+void wdc_ata_delref(struct ata_drive_datas *);
+void wdc_ata_kill_pending(struct ata_drive_datas *);
 
-int ata_get_params __P((struct ata_drive_datas*, u_int8_t,
-	 struct ataparams *));
-int ata_set_mode __P((struct ata_drive_datas*, u_int8_t, u_int8_t));
+int ata_get_params(struct ata_drive_datas*, u_int8_t,
+	 struct ataparams *);
+int ata_set_mode(struct ata_drive_datas*, u_int8_t, u_int8_t);
 /* return code for these cmds */
 #define CMD_OK    0
 #define CMD_ERR   1
 #define CMD_AGAIN 2
 
-void ata_dmaerr __P((struct ata_drive_datas *));
-void ata_perror __P((struct ata_drive_datas *, int, char *));
+void ata_dmaerr(struct ata_drive_datas *);
+void ata_perror(struct ata_drive_datas *, int, char *);
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index f515c96802b..b19f452878e 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.21 2002/01/07 19:04:46 mickey Exp $ */
+/*	$OpenBSD: wd.c,v 1.22 2002/03/14 01:26:52 millert Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -171,15 +171,15 @@ struct wd_softc {
 #define sc_badsect sc_wdc_bio.badsect
 
 #ifndef __OpenBSD__
-int	wdprobe		__P((struct device *, struct cfdata *, void *));
+int	wdprobe(struct device *, struct cfdata *, void *);
 #else
-int	wdprobe		__P((struct device *, void *, void *));
+int	wdprobe(struct device *, void *, void *);
 #endif
-void	wdattach	__P((struct device *, struct device *, void *));
-int     wddetach __P((struct device *, int));
-int     wdactivate __P((struct device *, enum devact));
-void    wdzeroref __P((struct device *));
-int	wdprint	__P((void *, char *));
+void	wdattach(struct device *, struct device *, void *);
+int     wddetach(struct device *, int);
+int     wdactivate(struct device *, enum devact);
+void    wdzeroref(struct device *);
+int	wdprint(void *, char *);
 
 struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach,
@@ -194,17 +194,17 @@ struct cfdriver wd_cd = {
 extern struct cfdriver wd_cd;
 #endif
 
-void  wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
-void  wdgetdisklabel __P((dev_t dev, struct wd_softc *, 
+void  wdgetdefaultlabel(struct wd_softc *, struct disklabel *);
+void  wdgetdisklabel(dev_t dev, struct wd_softc *, 
 				 struct disklabel *,
-				 struct cpu_disklabel *, int));
-void  wdstrategy	__P((struct buf *));
-void  wdstart	__P((void *));
-void  __wdstart	__P((struct wd_softc*, struct buf *));
-void  wdrestart __P((void*));
-int   wd_get_params __P((struct wd_softc *, u_int8_t, struct ataparams *));
-void  wd_flushcache __P((struct wd_softc *, int));
-void  wd_shutdown __P((void*));
+				 struct cpu_disklabel *, int);
+void  wdstrategy(struct buf *);
+void  wdstart(void *);
+void  __wdstart(struct wd_softc*, struct buf *);
+void  wdrestart(void*);
+int   wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *);
+void  wd_flushcache(struct wd_softc *, int);
+void  wd_shutdown(void*);
 
 struct dkdriver wddkdriver = { wdstrategy };
 
@@ -213,7 +213,7 @@ cdev_decl(wd);
 bdev_decl(wd);
 
 #ifdef DKBAD
-void	bad144intern __P((struct wd_softc *));
+void	bad144intern(struct wd_softc *);
 #endif
 
 #define wdlock(wd)  disk_lock(&(wd)->sc_dk)
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index a3daa7e2c59..79457d98210 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdvar.h,v 1.3 2001/01/25 03:50:50 todd Exp $	*/
+/*	$OpenBSD: wdvar.h,v 1.4 2002/03/14 01:26:52 millert Exp $	*/
 /*	$NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $	*/
 
 /*
@@ -77,6 +77,6 @@ struct ata_bio {
 #define MULTIMODE_WAIT 9
 #define READY          10
 
-int wdc_ata_bio __P((struct ata_drive_datas*, struct ata_bio*)); 
+int wdc_ata_bio(struct ata_drive_datas*, struct ata_bio*); 
 
-void wddone __P((void *));
+void wddone(void *);