First round of __P removal in sys

1 files changed, 32 insertions, 32 deletions

diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index 73353959070..92146092b3e 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ce4231.c,v 1.5 2002/01/24 03:06:54 jason Exp $	*/
+/*	$OpenBSD: ce4231.c,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -128,39 +128,39 @@
 #define	C_READ(sc,r)		\
     bus_space_read_4((sc)->sc_bustag, (sc)->sc_cdmahandle, (r))
 
-int	ce4231_match	__P((struct device *, void *, void *));
-void	ce4231_attach	__P((struct device *, struct device *, void *));
-int	ce4231_cintr	__P((void *));
-int	ce4231_pintr	__P((void *));
+int	ce4231_match(struct device *, void *, void *);
+void	ce4231_attach(struct device *, struct device *, void *);
+int	ce4231_cintr(void *);
+int	ce4231_pintr(void *);
 
-int	ce4231_set_speed	__P((struct ce4231_softc *, u_long *));
-void	ce4231_setup_output	__P((struct ce4231_softc *sc));
+int	ce4231_set_speed(struct ce4231_softc *, u_long *);
+void	ce4231_setup_output(struct ce4231_softc *sc);
 
-void		ce4231_write	__P((struct ce4231_softc *, u_int8_t, u_int8_t));
-u_int8_t	ce4231_read	__P((struct ce4231_softc *, u_int8_t));
+void		ce4231_write(struct ce4231_softc *, u_int8_t, u_int8_t);
+u_int8_t	ce4231_read(struct ce4231_softc *, u_int8_t);
 
 /* Audio interface */
-int	ce4231_open		__P((void *, int));
-void	ce4231_close		__P((void *));
-int	ce4231_query_encoding	__P((void *, struct audio_encoding *));
-int	ce4231_set_params	__P((void *, int, int, struct audio_params *,
-    struct audio_params *));
-int	ce4231_round_blocksize	__P((void *, int));
-int	ce4231_commit_settings	__P((void *));
-int	ce4231_halt_output	__P((void *));
-int	ce4231_halt_input	__P((void *));
-int	ce4231_getdev		__P((void *, struct audio_device *));
-int	ce4231_set_port		__P((void *, mixer_ctrl_t *));
-int	ce4231_get_port		__P((void *, mixer_ctrl_t *));
-int	ce4231_query_devinfo	__P((void *addr, mixer_devinfo_t *));
-void *	ce4231_alloc		__P((void *, int, size_t, int, int));
-void	ce4231_free		__P((void *, void *, int));
-size_t	ce4231_round_buffersize	__P((void *, int, size_t));
-int	ce4231_get_props	__P((void *));
+int	ce4231_open(void *, int);
+void	ce4231_close(void *);
+int	ce4231_query_encoding(void *, struct audio_encoding *);
+int	ce4231_set_params(void *, int, int, struct audio_params *,
+    struct audio_params *);
+int	ce4231_round_blocksize(void *, int);
+int	ce4231_commit_settings(void *);
+int	ce4231_halt_output(void *);
+int	ce4231_halt_input(void *);
+int	ce4231_getdev(void *, struct audio_device *);
+int	ce4231_set_port(void *, mixer_ctrl_t *);
+int	ce4231_get_port(void *, mixer_ctrl_t *);
+int	ce4231_query_devinfo(void *addr, mixer_devinfo_t *);
+void *	ce4231_alloc(void *, int, size_t, int, int);
+void	ce4231_free(void *, void *, int);
+size_t	ce4231_round_buffersize(void *, int, size_t);
+int	ce4231_get_props(void *);
 int	ce4231_trigger_output __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 int	ce4231_trigger_input __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 
 struct audio_hw_if ce4231_sa_hw_if = {
 	ce4231_open,
@@ -577,8 +577,8 @@ ce4231_set_params(addr, setmode, usemode, p, r)
 {
 	struct ce4231_softc *sc = (struct ce4231_softc *)addr;
 	int err, bits, enc;
-	void (*pswcode) __P((void *, u_char *, int cnt));
-	void (*rswcode) __P((void *, u_char *, int cnt));
+	void (*pswcode)(void *, u_char *, int cnt);
+	void (*rswcode)(void *, u_char *, int cnt);
 
 	enc = p->encoding;
 	pswcode = rswcode = 0;
@@ -1438,7 +1438,7 @@ int
 ce4231_trigger_output(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {
@@ -1510,7 +1510,7 @@ int
 ce4231_trigger_input(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {