Remove __P.

30 files changed, 229 insertions, 239 deletions

diff --git a/sys/crypto/blowfish/blowfish.h b/sys/crypto/blowfish/blowfish.h
index 26b3e7c78d29..5b63b15c63ef 100644
--- a/sys/crypto/blowfish/blowfish.h
+++ b/sys/crypto/blowfish/blowfish.h
@@ -80,9 +80,9 @@ typedef struct bf_key_st {
 	BF_LONG S[4*256];
 } BF_KEY;
 
-void BF_set_key __P((BF_KEY *, int, unsigned char *));
-void BF_encrypt __P((BF_LONG *, BF_KEY *));
-void BF_decrypt __P((BF_LONG *, BF_KEY *));
+void BF_set_key(BF_KEY *, int, unsigned char *);
+void BF_encrypt(BF_LONG *, BF_KEY *);
+void BF_decrypt(BF_LONG *, BF_KEY *);
 void BF_cbc_encrypt(const unsigned char *, unsigned char *, long,
 		    const BF_KEY *, unsigned char *, int);
 
diff --git a/sys/crypto/cast128/cast128.h b/sys/crypto/cast128/cast128.h
index fbfa5909d196..92fdad37ac01 100644
--- a/sys/crypto/cast128/cast128.h
+++ b/sys/crypto/cast128/cast128.h
@@ -46,14 +46,10 @@
 #define	CAST128_DECRYPT	0
 
 
-extern void set_cast128_subkey __P((u_int32_t *, u_int8_t *, int));
-extern void cast128_encrypt_round16 __P((u_int8_t *, const u_int8_t *,
-					u_int32_t *));
-extern void cast128_decrypt_round16 __P((u_int8_t *, const u_int8_t *,
-					u_int32_t *));
-extern void cast128_encrypt_round12 __P((u_int8_t *, const u_int8_t *,
-					u_int32_t *));
-extern void cast128_decrypt_round12 __P((u_int8_t *, const u_int8_t *,
-					u_int32_t *));
+extern void set_cast128_subkey(u_int32_t *, u_int8_t *, int);
+extern void cast128_encrypt_round16(u_int8_t *, const u_int8_t *, u_int32_t *);
+extern void cast128_decrypt_round16(u_int8_t *, const u_int8_t *, u_int32_t *);
+extern void cast128_encrypt_round12(u_int8_t *, const u_int8_t *, u_int32_t *);
+extern void cast128_decrypt_round12(u_int8_t *, const u_int8_t *, u_int32_t *);
 #endif
 
diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h
index 1eaa16ce818a..81c7bfbeef5e 100644
--- a/sys/crypto/des/des.h
+++ b/sys/crypto/des/des.h
@@ -81,35 +81,34 @@ typedef struct des_ks_struct
 
 extern int des_check_key;	/* defaults to false */
 
-char *des_options __P((void));
-void des_ecb_encrypt __P((des_cblock *, des_cblock *,
-	des_key_schedule, int));
+char *des_options(void);
+void des_ecb_encrypt(des_cblock *, des_cblock *, des_key_schedule, int);
 
-void des_encrypt1 __P((DES_LONG *, des_key_schedule, int));
-void des_encrypt2 __P((DES_LONG *, des_key_schedule, int));
-void des_encrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule,
-		      des_key_schedule));
-void des_decrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule,
-		      des_key_schedule));
+void des_encrypt1(DES_LONG *, des_key_schedule, int);
+void des_encrypt2(DES_LONG *, des_key_schedule, int);
+void des_encrypt3(DES_LONG *, des_key_schedule, des_key_schedule,
+		      des_key_schedule);
+void des_decrypt3(DES_LONG *, des_key_schedule, des_key_schedule,
+		      des_key_schedule);
 
-void des_ecb3_encrypt __P((des_cblock *, des_cblock *, des_key_schedule, 
-			  des_key_schedule, des_key_schedule, int));
+void des_ecb3_encrypt(des_cblock *, des_cblock *, des_key_schedule, 
+			  des_key_schedule, des_key_schedule, int);
 
-void des_ncbc_encrypt __P((const unsigned char *, unsigned char *, long,
-			  des_key_schedule, des_cblock *, int));
+void des_ncbc_encrypt(const unsigned char *, unsigned char *, long,
+			  des_key_schedule, des_cblock *, int);
 
 void des_ede3_cbc_encrypt(const unsigned char *, unsigned char *, long,
 			  des_key_schedule, des_key_schedule, 
 			  des_key_schedule, des_cblock *, int);
 
-void des_set_odd_parity __P((des_cblock *));
-void des_fixup_key_parity __P((des_cblock *)); 
-int des_is_weak_key __P((des_cblock *));
-int des_set_key __P((des_cblock *, des_key_schedule));
-int des_key_sched __P((des_cblock *, des_key_schedule));
-int des_set_key_checked __P((des_cblock *, des_key_schedule));
-void des_set_key_unchecked __P((des_cblock *, des_key_schedule));
-int des_check_key_parity __P((des_cblock *));
+void des_set_odd_parity(des_cblock *);
+void des_fixup_key_parity(des_cblock *); 
+int des_is_weak_key(des_cblock *);
+int des_set_key(des_cblock *, des_key_schedule);
+int des_key_sched(des_cblock *, des_key_schedule);
+int des_set_key_checked(des_cblock *, des_key_schedule);
+void des_set_key_unchecked(des_cblock *, des_key_schedule);
+int des_check_key_parity(des_cblock *);
 
 #ifdef  __cplusplus
 }
diff --git a/sys/crypto/md5.c b/sys/crypto/md5.c
index 3351d419d521..318c6ac8c8fe 100644
--- a/sys/crypto/md5.c
+++ b/sys/crypto/md5.c
@@ -127,7 +127,7 @@ static const u_int8_t md5_paddat[MD5_BUFLEN] = {
 	0,	0,	0,	0,	0,	0,	0,	0,	
 };
 
-static void md5_calc __P((u_int8_t *, md5_ctxt *));
+static void md5_calc(u_int8_t *, md5_ctxt *);
 
 void md5_init(ctxt)
 	md5_ctxt *ctxt;
diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h
index 241819985dc9..621b5abdd1ef 100644
--- a/sys/crypto/md5.h
+++ b/sys/crypto/md5.h
@@ -58,10 +58,10 @@ typedef struct {
 	u_int8_t	md5_buf[MD5_BUFLEN];
 } md5_ctxt;
 
-extern void md5_init __P((md5_ctxt *));
-extern void md5_loop __P((md5_ctxt *, u_int8_t *, u_int));
-extern void md5_pad __P((md5_ctxt *));
-extern void md5_result __P((u_int8_t *, md5_ctxt *));
+extern void md5_init(md5_ctxt *);
+extern void md5_loop(md5_ctxt *, u_int8_t *, u_int);
+extern void md5_pad(md5_ctxt *);
+extern void md5_result(u_int8_t *, md5_ctxt *);
 
 /* compatibility */
 #define MD5_CTX		md5_ctxt
diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c
index b210b52ae89e..3ba2c10329d9 100644
--- a/sys/crypto/sha1.c
+++ b/sys/crypto/sha1.c
@@ -84,7 +84,7 @@ static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
 		sha1_step(ctxt);		\
      }
 
-static void sha1_step __P((struct sha1_ctxt *));
+static void sha1_step(struct sha1_ctxt *);
 
 static void
 sha1_step(ctxt)
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index 9162ce65a714..3686d7ddde51 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -55,10 +55,10 @@ struct sha1_ctxt {
 };
 
 #ifdef _KERNEL
-extern void sha1_init __P((struct sha1_ctxt *));
-extern void sha1_pad __P((struct sha1_ctxt *));
-extern void sha1_loop __P((struct sha1_ctxt *, const u_int8_t *, size_t));
-extern void sha1_result __P((struct sha1_ctxt *, caddr_t));
+extern void sha1_init(struct sha1_ctxt *);
+extern void sha1_pad(struct sha1_ctxt *);
+extern void sha1_loop(struct sha1_ctxt *, const u_int8_t *, size_t);
+extern void sha1_result(struct sha1_ctxt *, caddr_t);
 
 /* compatibilty with other SHA1 source codes */
 typedef struct sha1_ctxt SHA1_CTX;
diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h
index 084faa71f13d..12da95c92bda 100644
--- a/sys/crypto/sha2/sha2.h
+++ b/sys/crypto/sha2/sha2.h
@@ -115,23 +115,23 @@ typedef SHA512_CTX SHA384_CTX;
 
 /*** SHA-256/384/512 Function Prototypes ******************************/
 
-void SHA256_Init __P((SHA256_CTX *));
-void SHA256_Update __P((SHA256_CTX*, const u_int8_t*, size_t));
-void SHA256_Final __P((u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*));
-char* SHA256_End __P((SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]));
-char* SHA256_Data __P((const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]));
-
-void SHA384_Init __P((SHA384_CTX*));
-void SHA384_Update __P((SHA384_CTX*, const u_int8_t*, size_t));
-void SHA384_Final __P((u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*));
-char* SHA384_End __P((SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]));
-char* SHA384_Data __P((const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]));
-
-void SHA512_Init __P((SHA512_CTX*));
-void SHA512_Update __P((SHA512_CTX*, const u_int8_t*, size_t));
-void SHA512_Final __P((u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*));
-char* SHA512_End __P((SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]));
-char* SHA512_Data __P((const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]));
+void SHA256_Init(SHA256_CTX *);
+void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
+void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
+void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
+void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
 
 #ifdef	__cplusplus
 }
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 715c1cb002c3..9709c3141f67 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -36,8 +36,7 @@
 /*
  * Data access functions for debugger.
  */
-db_expr_t	db_get_value __P((db_addr_t addr, int size,
-				  boolean_t is_signed));
-void		db_put_value __P((db_addr_t addr, int size, db_expr_t value));
+db_expr_t	db_get_value(db_addr_t addr, int size, boolean_t is_signed);
+void		db_put_value(db_addr_t addr, int size, db_expr_t value);
 
 #endif /* !_DDB_DB_ACCESS_H_ */
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index d62d8c3add9d..9522f3b374da 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -49,13 +49,12 @@ static db_breakpoint_t		db_next_free_breakpoint = &db_break_table[0];
 static db_breakpoint_t		db_free_breakpoints = 0;
 static db_breakpoint_t		db_breakpoint_list = 0;
 
-static db_breakpoint_t	db_breakpoint_alloc __P((void));
-static void	db_breakpoint_free __P((db_breakpoint_t bkpt));
-static void	db_delete_breakpoint __P((vm_map_t map, db_addr_t addr));
-static db_breakpoint_t	db_find_breakpoint __P((vm_map_t map, db_addr_t addr));
-static void	db_list_breakpoints __P((void));
-static void	db_set_breakpoint __P((vm_map_t map, db_addr_t addr,
-				       int count));
+static db_breakpoint_t	db_breakpoint_alloc(void);
+static void	db_breakpoint_free(db_breakpoint_t bkpt);
+static void	db_delete_breakpoint(vm_map_t map, db_addr_t addr);
+static db_breakpoint_t	db_find_breakpoint(vm_map_t map, db_addr_t addr);
+static void	db_list_breakpoints(void);
+static void	db_set_breakpoint(vm_map_t map, db_addr_t addr, int count);
 
 static db_breakpoint_t
 db_breakpoint_alloc()
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 88520da73d79..d6ed76e6a821 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -54,14 +54,14 @@ struct db_breakpoint {
 };
 typedef struct db_breakpoint *db_breakpoint_t;
 
-void		db_clear_breakpoints __P((void));
+void		db_clear_breakpoints(void);
 #ifdef SOFTWARE_SSTEP
-void		db_delete_temp_breakpoint __P((db_breakpoint_t));
+void		db_delete_temp_breakpoint(db_breakpoint_t);
 #endif
-db_breakpoint_t	db_find_breakpoint_here __P((db_addr_t addr));
-void		db_set_breakpoints __P((void));
+db_breakpoint_t	db_find_breakpoint_here(db_addr_t addr);
+void		db_set_breakpoints(void);
 #ifdef SOFTWARE_SSTEP
-db_breakpoint_t	db_set_temp_breakpoint __P((db_addr_t));
+db_breakpoint_t	db_set_temp_breakpoint(db_addr_t);
 #endif
 
 #endif /* !_DDB_DB_BREAK_H_ */
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index d41cf9c75ee0..9d3be3b22b34 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -101,17 +101,17 @@ db_skip_to_eol()
 #define	CMD_AMBIGUOUS	3
 #define	CMD_HELP	4
 
-static void	db_cmd_list __P((struct command *table,
+static void	db_cmd_list(struct command *table,
 				 struct command **aux_tablep,
-				 struct command **aux_tablep_end));
-static int	db_cmd_search __P((char *name, struct command *table,
+				 struct command **aux_tablep_end);
+static int	db_cmd_search(char *name, struct command *table,
 				   struct command **aux_tablep,
 				   struct command **aux_tablep_end,
-				   struct command **cmdp));
-static void	db_command __P((struct command **last_cmdp,
+				   struct command **cmdp);
+static void	db_command(struct command **last_cmdp,
 				struct command *cmd_table,
 				struct command **aux_cmd_tablep,
-				struct command **aux_cmd_tablep_end));
+				struct command **aux_cmd_tablep_end);
 
 /*
  * Search for command prefix.
@@ -503,10 +503,10 @@ db_fncall(dummy1, dummy2, dummy3, dummy4)
 	db_expr_t	args[MAXARGS];
 	int		nargs = 0;
 	db_expr_t	retval;
-	typedef db_expr_t fcn_10args_t __P((db_expr_t, db_expr_t, db_expr_t,
+	typedef db_expr_t fcn_10args_t(db_expr_t, db_expr_t, db_expr_t,
 					    db_expr_t, db_expr_t, db_expr_t,
 					    db_expr_t, db_expr_t, db_expr_t,
-					    db_expr_t));
+					    db_expr_t);
 	fcn_10args_t	*func;
 	int		t;
 
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index a95f5b3aaee3..bc5fe6cbe42a 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -37,7 +37,7 @@
  * Command loop declarations.
  */
 
-void	db_command_loop __P((void));
+void	db_command_loop(void);
 
 extern db_addr_t	db_dot;		/* current location */
 extern db_addr_t	db_last_addr;	/* last explicit address typed */
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 87143e11a835..dd1cadd80260 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -44,8 +44,8 @@
 
 static char	db_examine_format[TOK_STRING_SIZE] = "x";
 
-static void	db_examine __P((db_addr_t, char *, int));
-static void	db_search __P((db_addr_t, int, db_expr_t, db_expr_t, u_int));
+static void	db_examine(db_addr_t, char *, int);
+static void	db_search(db_addr_t, int, db_expr_t, db_expr_t, u_int);
 
 /*
  * Examine (print) data.
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 61f7fc13b94c..850121b42eae 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -37,11 +37,11 @@
 #include <ddb/db_access.h>
 #include <ddb/db_command.h>
 
-static boolean_t	db_add_expr __P((db_expr_t *valuep));
-static boolean_t	db_mult_expr __P((db_expr_t *valuep));
-static boolean_t	db_shift_expr __P((db_expr_t *valuep));
-static boolean_t	db_term __P((db_expr_t *valuep));
-static boolean_t	db_unary __P((db_expr_t *valuep));
+static boolean_t	db_add_expr(db_expr_t *valuep);
+static boolean_t	db_mult_expr(db_expr_t *valuep);
+static boolean_t	db_shift_expr(db_expr_t *valuep);
+static boolean_t	db_term(db_expr_t *valuep);
+static boolean_t	db_unary(db_expr_t *valuep);
 
 static boolean_t
 db_term(valuep)
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index f433861f9668..bee293f0b1fa 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -63,11 +63,11 @@ static int	db_lhist_nlines;
 #define	BLANK		' '
 #define	BACKUP		'\b'
 
-static int	cnmaygetc __P((void));
-static void	db_delete __P((int n, int bwd));
-static int	db_inputchar __P((int c));
-static void	db_putnchars __P((int c, int count));
-static void	db_putstring __P((char *s, int count));
+static int	cnmaygetc(void);
+static void	db_delete(int n, int bwd);
+static int	db_inputchar(int c);
+static void	db_putnchars(int c, int count);
+static void	db_putstring(char *s, int count);
 
 void
 db_putstring(s, count)
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 123cd3f70a39..63adf2b07d7f 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -41,10 +41,10 @@
 static char	db_line[120];
 static char *	db_lp, *db_endlp;
 
-static int	db_lex __P((void));
-static void 	db_flush_line __P((void));
-static int 	db_read_char __P((void));
-static void 	db_unread_char __P((int));
+static int	db_lex(void);
+static void 	db_flush_line(void);
+static int 	db_read_char(void);
+static void 	db_unread_char(int);
 
 int
 db_read_line()
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index c4e0ee2a6ba4..538a86675035 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -36,10 +36,10 @@
 /*
  * Lexical analyzer.
  */
-void	db_flush_lex __P((void));
-int	db_read_line __P((void));
-int	db_read_token __P((void));
-void	db_unread_token __P((int t));
+void	db_flush_lex(void);
+int	db_read_line(void);
+int	db_read_token(void);
+void	db_unread_token(int t);
 
 extern db_expr_t	db_tok_number;
 #define	TOK_STRING_SIZE		120
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 9192c183c6ae..e82eea64cc18 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -63,7 +63,7 @@ db_expr_t	db_tab_stop_width = 8;		/* how wide are tab stops? */
 	((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width)
 db_expr_t	db_max_width = 79;		/* output line width */
 
-static void db_putchar __P((int c, void *arg));
+static void db_putchar(int c, void *arg);
 
 /*
  * Force pending whitespace.
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 8172bbba6d83..cca5a8975379 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -38,8 +38,8 @@
  * Printing routines for kernel debugger.
  */
 
-void	db_end_line __P((void));
-void	db_force_whitespace __P((void));
-int	db_print_position __P((void));
+void	db_end_line(void);
+void	db_force_whitespace(void);
+int	db_print_position(void);
 
 #endif /* !_DDB_DB_OUTPUT_H_ */
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index c17d0a4bf867..4b4875fd4f52 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -60,14 +60,14 @@ int		db_load_count;
 int		db_store_count;
 
 #ifndef db_set_single_step
-extern void	db_set_single_step __P((db_regs_t *regs));
+extern void	db_set_single_step(db_regs_t *regs);
 #endif
 #ifndef db_clear_single_step
-extern void	db_clear_single_step __P((db_regs_t *regs));
+extern void	db_clear_single_step(db_regs_t *regs);
 #endif
 
 #ifdef notused
-static void	db_single_step __P((db_regs_t *regs));
+static void	db_single_step(db_regs_t *regs);
 #endif
 
 boolean_t
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 7cba6883426b..08eb1c066aa8 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -48,11 +48,10 @@ static int db_nsymtab = 0;
 
 static db_symtab_t	*db_last_symtab; /* where last symbol was found */
 
-static c_db_sym_t	db_lookup __P(( const char *symstr));
-static char		*db_qualify __P((c_db_sym_t sym, char *symtabname));
-static boolean_t	db_symbol_is_ambiguous __P((c_db_sym_t sym));
-static boolean_t	db_line_at_pc __P((c_db_sym_t, char **, int *, 
-				db_expr_t));
+static c_db_sym_t	db_lookup( const char *symstr);
+static char		*db_qualify(c_db_sym_t sym, char *symtabname);
+static boolean_t	db_symbol_is_ambiguous(c_db_sym_t sym);
+static boolean_t	db_line_at_pc(c_db_sym_t, char **, int *, db_expr_t);
 
 /*
  * Add symbol table, with given name, to list of symbol tables.
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index e4decf403701..6b937c89b815 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -69,13 +69,13 @@ typedef int		db_strategy_t;	/* search strategy */
 /*
  * Functions exported by the symtable module
  */
-void		db_add_symbol_table __P((char *, char *, char *, char *));
+void		db_add_symbol_table(char *, char *, char *, char *);
 					/* extend the list of symbol tables */
 
-c_db_sym_t	db_search_symbol __P((db_addr_t, db_strategy_t, db_expr_t *));
+c_db_sym_t	db_search_symbol(db_addr_t, db_strategy_t, db_expr_t *);
 					/* find symbol given value */
 
-void		db_symbol_values __P((c_db_sym_t, const char **, db_expr_t *));
+void		db_symbol_values(c_db_sym_t, const char **, db_expr_t *);
 					/* return name and value of symbol */
 
 #define db_find_sym_and_offset(val,namep,offp)	\
@@ -86,25 +86,25 @@ void		db_symbol_values __P((c_db_sym_t, const char **, db_expr_t *));
 	db_symbol_values(db_search_symbol(val,DB_STGY_XTRN,offp),namep,0)
 					/* ditto, but no locals */
 
-int		db_eqname __P((const char *, const char *, int));
+int		db_eqname(const char *, const char *, int);
 					/* strcmp, modulo leading char */
 
-void		db_printsym __P((db_expr_t, db_strategy_t));
+void		db_printsym(db_expr_t, db_strategy_t);
 					/* print closest symbol to a value */
 
-int		db_sym_numargs __P((c_db_sym_t, int *, char **));
+int		db_sym_numargs(c_db_sym_t, int *, char **);
 
-boolean_t	X_db_line_at_pc __P((db_symtab_t *symtab, c_db_sym_t cursym,
+boolean_t	X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t cursym,
 				     char **filename, int *linenum,
-				     db_expr_t off));
-c_db_sym_t	X_db_lookup __P((db_symtab_t *stab, const char *symstr));
-c_db_sym_t	X_db_search_symbol __P((db_symtab_t *symtab, db_addr_t off,
+				     db_expr_t off);
+c_db_sym_t	X_db_lookup(db_symtab_t *stab, const char *symstr);
+c_db_sym_t	X_db_search_symbol(db_symtab_t *symtab, db_addr_t off,
 					db_strategy_t strategy,
-					db_expr_t *diffp));
-int		X_db_sym_numargs __P((db_symtab_t *, c_db_sym_t, int *,
-				      char **));
-void		X_db_symbol_values __P((db_symtab_t *symtab,
+					db_expr_t *diffp);
+int		X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *,
+				      char **);
+void		X_db_symbol_values(db_symtab_t *symtab,
 					c_db_sym_t sym, const char **namep,
-					db_expr_t *valuep));
+					db_expr_t *valuep);
 
 #endif /* !_DDB_DB_SYM_H_ */
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 8c0eb98fe743..b985f783d1af 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -38,11 +38,11 @@
 #include <ddb/db_lex.h>
 #include <ddb/db_variables.h>
 
-static int	db_find_variable __P((struct db_variable **varp));
-static void	db_write_variable __P((struct db_variable *, db_expr_t *));
+static int	db_find_variable(struct db_variable **varp);
+static void	db_write_variable(struct db_variable *, db_expr_t *);
 
 #ifdef notused
-static int	db_set_variable __P((db_expr_t value));
+static int	db_set_variable(db_expr_t value);
 #endif
 
 static struct db_variable db_vars[] = {
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index f430f0d8c94d..6c05118efdd5 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -38,8 +38,7 @@
  * Debugger variables.
  */
 struct db_variable;
-typedef	int	db_varfcn_t __P((struct db_variable *vp, db_expr_t *valuep,
-				 int op));
+typedef	int	db_varfcn_t(struct db_variable *vp, db_expr_t *valuep, int op);
 struct db_variable {
 	char	*name;		/* Name of variable */
 	db_expr_t *valuep;	/* value of variable */
@@ -53,6 +52,6 @@ struct db_variable {
 extern struct db_variable	db_regs[];	/* machine registers */
 extern struct db_variable	*db_eregs;
 
-void	db_read_variable __P((struct db_variable *, db_expr_t *));
+void	db_read_variable(struct db_variable *, db_expr_t *);
 
 #endif /* _!DDB_DB_VARIABLES_H_ */
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index abfb8534a5f7..f25b2951d41b 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -55,21 +55,20 @@ static db_watchpoint_t	db_next_free_watchpoint = &db_watch_table[0];
 static db_watchpoint_t	db_free_watchpoints = 0;
 static db_watchpoint_t	db_watchpoint_list = 0;
 
-static db_watchpoint_t	db_watchpoint_alloc __P((void));
-static void		db_watchpoint_free __P((db_watchpoint_t watch));
-static void		db_delete_watchpoint __P((vm_map_t map,
-					db_addr_t addr));
+static db_watchpoint_t	db_watchpoint_alloc(void);
+static void		db_watchpoint_free(db_watchpoint_t watch);
+static void		db_delete_watchpoint(vm_map_t map, db_addr_t addr);
 #ifdef notused
-static boolean_t	db_find_watchpoint __P((vm_map_t map, db_addr_t addr,
-					db_regs_t *regs));
+static boolean_t	db_find_watchpoint(vm_map_t map, db_addr_t addr,
+					db_regs_t *regs);
 #endif
-static void		db_list_watchpoints __P((void));
-static void		db_set_watchpoint __P((vm_map_t map, db_addr_t addr,
-				       vm_size_t size));
+static void		db_list_watchpoints(void);
+static void		db_set_watchpoint(vm_map_t map, db_addr_t addr,
+				       vm_size_t size);
 
-int  db_md_set_watchpoint   __P((db_expr_t addr, db_expr_t size));
-int  db_md_clr_watchpoint   __P((db_expr_t addr, db_expr_t size));
-void db_md_list_watchpoints __P((void));
+int  db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
+int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
+void db_md_list_watchpoints(void);
 
 
 db_watchpoint_t
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index df602d0da70f..fbaf5e67464d 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -39,8 +39,8 @@
 
 #include <machine/db_machdep.h>		/* type definitions */
 
-typedef void db_cmdfcn_t __P((db_expr_t addr, boolean_t have_addr,
-			      db_expr_t count, char *modif));
+typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr,
+			      db_expr_t count, char *modif);
 
 #define DB_COMMAND(cmd_name, func_name) \
 	DB_SET(cmd_name, func_name, db_cmd_set)
@@ -79,32 +79,32 @@ extern db_expr_t db_tab_stop_width;
 
 struct vm_map;
 
-void		db_check_interrupt __P((void));
-void		db_clear_watchpoints __P((void));
-db_addr_t	db_disasm __P((db_addr_t loc, boolean_t altfmt));
+void		db_check_interrupt(void);
+void		db_clear_watchpoints(void);
+db_addr_t	db_disasm(db_addr_t loc, boolean_t altfmt);
 				/* instruction disassembler */
-void		db_error __P((char *s));
-int		db_expression __P((db_expr_t *valuep));
-int		db_get_variable __P((db_expr_t *valuep));
-void		db_iprintf __P((const char *,...)) __printflike(1, 2);
-struct vm_map	*db_map_addr __P((vm_offset_t));
-boolean_t	db_map_current __P((struct vm_map *));
-boolean_t	db_map_equal __P((struct vm_map *, struct vm_map *));
-void		db_print_loc_and_inst __P((db_addr_t loc));
-void		db_printf __P((const char *fmt, ...)) __printflike(1, 2);
-void		db_read_bytes __P((vm_offset_t addr, size_t size, char *data));
+void		db_error(char *s);
+int		db_expression(db_expr_t *valuep);
+int		db_get_variable(db_expr_t *valuep);
+void		db_iprintf(const char *,...) __printflike(1, 2);
+struct vm_map	*db_map_addr(vm_offset_t);
+boolean_t	db_map_current(struct vm_map *);
+boolean_t	db_map_equal(struct vm_map *, struct vm_map *);
+void		db_print_loc_and_inst(db_addr_t loc);
+void		db_printf(const char *fmt, ...) __printflike(1, 2);
+void		db_read_bytes(vm_offset_t addr, size_t size, char *data);
 				/* machine-dependent */
-int		db_readline __P((char *lstart, int lsize));
-void		db_restart_at_pc __P((boolean_t watchpt));
-void		db_set_watchpoints __P((void));
-void		db_skip_to_eol __P((void));
-boolean_t	db_stop_at_pc __P((boolean_t *is_breakpoint));
+int		db_readline(char *lstart, int lsize);
+void		db_restart_at_pc(boolean_t watchpt);
+void		db_set_watchpoints(void);
+void		db_skip_to_eol(void);
+boolean_t	db_stop_at_pc(boolean_t *is_breakpoint);
 #define		db_strcpy	strcpy
-void		db_trap __P((int type, int code));
-int		db_value_of_name __P((const char *name, db_expr_t *valuep));
-void		db_write_bytes __P((vm_offset_t addr, size_t size, char *data));
+void		db_trap(int type, int code);
+int		db_value_of_name(const char *name, db_expr_t *valuep);
+void		db_write_bytes(vm_offset_t addr, size_t size, char *data);
 				/* machine-dependent */
-void		kdb_init __P((void));
+void		kdb_init(void);
 
 db_cmdfcn_t	db_breakpoint_cmd;
 db_cmdfcn_t	db_continue_cmd;
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 6be30d459f69..9afb9f348a93 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -227,15 +227,15 @@ typedef struct old_mousemode {
 } old_mousemode_t;
 
 /* packet formatting function */
-typedef int packetfunc_t __P((struct psm_softc *, unsigned char *,
-			      int *, int, mousestatus_t *));
+typedef int packetfunc_t(struct psm_softc *, unsigned char *,
+			      int *, int, mousestatus_t *);
 
 /* function prototypes */
-static void psmidentify __P((driver_t *, device_t));
-static int psmprobe __P((device_t));
-static int psmattach __P((device_t));
-static int psmdetach __P((device_t));
-static int psmresume __P((device_t));
+static void psmidentify(driver_t *, device_t);
+static int psmprobe(device_t);
+static int psmattach(device_t);
+static int psmdetach(device_t);
+static int psmresume(device_t);
 
 static d_open_t psmopen;
 static d_close_t psmclose;
@@ -243,30 +243,30 @@ static d_read_t psmread;
 static d_ioctl_t psmioctl;
 static d_poll_t psmpoll;
 
-static int enable_aux_dev __P((KBDC));
-static int disable_aux_dev __P((KBDC));
-static int get_mouse_status __P((KBDC, int *, int, int));
-static int get_aux_id __P((KBDC));
-static int set_mouse_sampling_rate __P((KBDC, int));
-static int set_mouse_scaling __P((KBDC, int));
-static int set_mouse_resolution __P((KBDC, int));
-static int set_mouse_mode __P((KBDC));
-static int get_mouse_buttons __P((KBDC));
-static int is_a_mouse __P((int));
-static void recover_from_error __P((KBDC));
-static int restore_controller __P((KBDC, int));
-static int doinitialize __P((struct psm_softc *, mousemode_t *));
-static int doopen __P((struct psm_softc *, int));
-static int reinitialize __P((struct psm_softc *, int));
-static char *model_name __P((int));
-static void psmintr __P((void *));
-static void psmtimeout __P((void *));
+static int enable_aux_dev(KBDC);
+static int disable_aux_dev(KBDC);
+static int get_mouse_status(KBDC, int *, int, int);
+static int get_aux_id(KBDC);
+static int set_mouse_sampling_rate(KBDC, int);
+static int set_mouse_scaling(KBDC, int);
+static int set_mouse_resolution(KBDC, int);
+static int set_mouse_mode(KBDC);
+static int get_mouse_buttons(KBDC);
+static int is_a_mouse(int);
+static void recover_from_error(KBDC);
+static int restore_controller(KBDC, int);
+static int doinitialize(struct psm_softc *, mousemode_t *);
+static int doopen(struct psm_softc *, int);
+static int reinitialize(struct psm_softc *, int);
+static char *model_name(int);
+static void psmintr(void *);
+static void psmtimeout(void *);
 
 /* vendor specific features */
-typedef int probefunc_t __P((struct psm_softc *));
+typedef int probefunc_t(struct psm_softc *);
 
-static int mouse_id_proc1 __P((KBDC, int, int, int *));
-static int mouse_ext_command __P((KBDC, int));
+static int mouse_id_proc1(KBDC, int, int, int *);
+static int mouse_ext_command(KBDC, int);
 static probefunc_t enable_groller;
 static probefunc_t enable_gmouse;
 static probefunc_t enable_aglide; 
@@ -277,7 +277,7 @@ static probefunc_t enable_4dmouse;
 static probefunc_t enable_4dplus;
 static probefunc_t enable_mmanplus;
 static probefunc_t enable_versapad;
-static int tame_mouse __P((struct psm_softc *, mousestatus_t *, unsigned char *));
+static int tame_mouse(struct psm_softc *, mousestatus_t *, unsigned char *);
 
 static struct {
     int                 model;
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index fa27c3cd7fc5..774d6a40291b 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -167,14 +167,14 @@ ISA_ACCESSOR(configattr, CONFIGATTR, int)
 extern intrmask_t isa_irq_pending(void);
 extern void	isa_probe_children(device_t dev);
 
-extern void	isa_dmacascade __P((int chan));
-extern void	isa_dmadone __P((int flags, caddr_t addr, int nbytes, int chan));
-extern void	isa_dmainit __P((int chan, u_int bouncebufsize));
-extern void	isa_dmastart __P((int flags, caddr_t addr, u_int nbytes, int chan));
-extern int	isa_dma_acquire __P((int chan));
-extern void	isa_dma_release __P((int chan));
-extern int	isa_dmastatus __P((int chan));
-extern int	isa_dmastop __P((int chan));
+extern void	isa_dmacascade(int chan);
+extern void	isa_dmadone(int flags, caddr_t addr, int nbytes, int chan);
+extern void	isa_dmainit(int chan, u_int bouncebufsize);
+extern void	isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan);
+extern int	isa_dma_acquire(int chan);
+extern void	isa_dma_release(int chan);
+extern int	isa_dmastatus(int chan);
+extern int	isa_dmastop(int chan);
 
 #ifdef PC98
 #include <machine/bus.h>
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index 6be30d459f69..9afb9f348a93 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -227,15 +227,15 @@ typedef struct old_mousemode {
 } old_mousemode_t;
 
 /* packet formatting function */
-typedef int packetfunc_t __P((struct psm_softc *, unsigned char *,
-			      int *, int, mousestatus_t *));
+typedef int packetfunc_t(struct psm_softc *, unsigned char *,
+			      int *, int, mousestatus_t *);
 
 /* function prototypes */
-static void psmidentify __P((driver_t *, device_t));
-static int psmprobe __P((device_t));
-static int psmattach __P((device_t));
-static int psmdetach __P((device_t));
-static int psmresume __P((device_t));
+static void psmidentify(driver_t *, device_t);
+static int psmprobe(device_t);
+static int psmattach(device_t);
+static int psmdetach(device_t);
+static int psmresume(device_t);
 
 static d_open_t psmopen;
 static d_close_t psmclose;
@@ -243,30 +243,30 @@ static d_read_t psmread;
 static d_ioctl_t psmioctl;
 static d_poll_t psmpoll;
 
-static int enable_aux_dev __P((KBDC));
-static int disable_aux_dev __P((KBDC));
-static int get_mouse_status __P((KBDC, int *, int, int));
-static int get_aux_id __P((KBDC));
-static int set_mouse_sampling_rate __P((KBDC, int));
-static int set_mouse_scaling __P((KBDC, int));
-static int set_mouse_resolution __P((KBDC, int));
-static int set_mouse_mode __P((KBDC));
-static int get_mouse_buttons __P((KBDC));
-static int is_a_mouse __P((int));
-static void recover_from_error __P((KBDC));
-static int restore_controller __P((KBDC, int));
-static int doinitialize __P((struct psm_softc *, mousemode_t *));
-static int doopen __P((struct psm_softc *, int));
-static int reinitialize __P((struct psm_softc *, int));
-static char *model_name __P((int));
-static void psmintr __P((void *));
-static void psmtimeout __P((void *));
+static int enable_aux_dev(KBDC);
+static int disable_aux_dev(KBDC);
+static int get_mouse_status(KBDC, int *, int, int);
+static int get_aux_id(KBDC);
+static int set_mouse_sampling_rate(KBDC, int);
+static int set_mouse_scaling(KBDC, int);
+static int set_mouse_resolution(KBDC, int);
+static int set_mouse_mode(KBDC);
+static int get_mouse_buttons(KBDC);
+static int is_a_mouse(int);
+static void recover_from_error(KBDC);
+static int restore_controller(KBDC, int);
+static int doinitialize(struct psm_softc *, mousemode_t *);
+static int doopen(struct psm_softc *, int);
+static int reinitialize(struct psm_softc *, int);
+static char *model_name(int);
+static void psmintr(void *);
+static void psmtimeout(void *);
 
 /* vendor specific features */
-typedef int probefunc_t __P((struct psm_softc *));
+typedef int probefunc_t(struct psm_softc *);
 
-static int mouse_id_proc1 __P((KBDC, int, int, int *));
-static int mouse_ext_command __P((KBDC, int));
+static int mouse_id_proc1(KBDC, int, int, int *);
+static int mouse_ext_command(KBDC, int);
 static probefunc_t enable_groller;
 static probefunc_t enable_gmouse;
 static probefunc_t enable_aglide; 
@@ -277,7 +277,7 @@ static probefunc_t enable_4dmouse;
 static probefunc_t enable_4dplus;
 static probefunc_t enable_mmanplus;
 static probefunc_t enable_versapad;
-static int tame_mouse __P((struct psm_softc *, mousestatus_t *, unsigned char *));
+static int tame_mouse(struct psm_softc *, mousestatus_t *, unsigned char *);
 
 static struct {
     int                 model;