Remove __P.

30 files changed, 346 insertions, 347 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index af2cb5f..232f629 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -91,9 +91,9 @@
 device_t isa_bus_device = 0;
 #endif
 
-static void	configure_first __P((void *));
-static void	configure __P((void *));
-static void	configure_final __P((void *));
+static void	configure_first(void *);
+static void	configure(void *);
+static void	configure_final(void *);
 
 #if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT)
 static void	pxe_setup_nfsdiskless(void);
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index e742764..43e6d1f 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -861,13 +861,13 @@ static const int db_lengths[] = {
 	(loc) += (size);
 
 static db_addr_t
-		db_disasm_esc __P((db_addr_t loc, int inst, int short_addr,
-				   int size, const char *seg));
-static void	db_print_address __P((const char *seg, int size,
-				      struct i_addr *addrp));
+		db_disasm_esc(db_addr_t loc, int inst, int short_addr,
+				   int size, const char *seg);
+static void	db_print_address(const char *seg, int size,
+				      struct i_addr *addrp);
 static db_addr_t
-		db_read_address __P((db_addr_t loc, int short_addr,
-				     int regmodrm, struct i_addr *addrp));
+		db_read_address(db_addr_t loc, int short_addr,
+				     int regmodrm, struct i_addr *addrp);
 
 /*
  * Read address at location and return updated location.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index bb5a5b1..2ba81da 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -52,7 +52,7 @@
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;
 
-extern void	gdb_handle_exception __P((db_regs_t *, int, int));
+extern void	gdb_handle_exception(db_regs_t *, int, int);
 
 int	db_active;
 db_regs_t ddb_regs;
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 6a07631..c9324e7 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -104,19 +104,19 @@ struct i386_frame {
 #define	INTERRUPT	2
 #define	SYSCALL		3
 
-static void db_nextframe __P((struct i386_frame **, db_addr_t *, struct proc *));
-static int db_numargs __P((struct i386_frame *));
-static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t));
-static void decode_syscall __P((int, struct proc *));
-
-
-static char * watchtype_str __P((int type));
-int  i386_set_watch         __P((int watchnum, unsigned int watchaddr, 
-                                 int size, int access, struct dbreg * d));
-int  i386_clr_watch         __P((int watchnum, struct dbreg * d));
-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));
+static void db_nextframe(struct i386_frame **, db_addr_t *, struct proc *);
+static int db_numargs(struct i386_frame *);
+static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t);
+static void decode_syscall(int, struct proc *);
+
+
+static char * watchtype_str(int type);
+int  i386_set_watch(int watchnum, unsigned int watchaddr, 
+                                 int size, int access, struct dbreg * d);
+int  i386_clr_watch(int watchnum, struct dbreg * d);
+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);
 
 
 /*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 5859004..ff8f10c 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -119,8 +119,8 @@
 #include <sys/ptrace.h>
 #include <machine/sigframe.h>
 
-extern void init386 __P((int first));
-extern void dblfault_handler __P((void));
+extern void init386(int first);
+extern void dblfault_handler(void);
 
 extern void printcpuinfo(void);	/* XXX header file */
 extern void earlysetcpuclass(void);	/* same header file */
@@ -131,10 +131,10 @@ extern void initializecpu(void);
 #define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
 #define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 
-static void cpu_startup __P((void *));
+static void cpu_startup(void *);
 #ifdef CPU_ENABLE_SSE
-static void set_fpregs_xmm __P((struct save87 *, struct savexmm *));
-static void fill_fpregs_xmm __P((struct savexmm *, struct save87 *));
+static void set_fpregs_xmm(struct save87 *, struct savexmm *);
+static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
 #endif /* CPU_ENABLE_SSE */
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
@@ -160,7 +160,7 @@ int physmem = 0;
 int cold = 1;
 
 #ifdef COMPAT_43
-static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code));
+static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
 #endif
 
 static int
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index e3dd31a..9643191 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index e3dd31a..9643191 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 59192c5..cd4a914 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -194,30 +194,30 @@ extern pt_entry_t *SMPpt;
 static pt_entry_t *PMAP1 = 0;
 static pt_entry_t *PADDR1 = 0;
 
-static PMAP_INLINE void	free_pv_entry __P((pv_entry_t pv));
-static pt_entry_t *get_ptbase __P((pmap_t pmap));
-static pv_entry_t get_pv_entry __P((void));
-static void	i386_protection_init __P((void));
-static __inline void	pmap_changebit __P((vm_page_t m, int bit, boolean_t setem));
-
-static void	pmap_remove_all __P((vm_page_t m));
-static vm_page_t pmap_enter_quick __P((pmap_t pmap, vm_offset_t va,
-				      vm_page_t m, vm_page_t mpte));
-static int pmap_remove_pte __P((pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva));
-static void pmap_remove_page __P((struct pmap *pmap, vm_offset_t va));
-static int pmap_remove_entry __P((struct pmap *pmap, vm_page_t m,
-					vm_offset_t va));
-static boolean_t pmap_testbit __P((vm_page_t m, int bit));
-static void pmap_insert_entry __P((pmap_t pmap, vm_offset_t va,
-		vm_page_t mpte, vm_page_t m));
-
-static vm_page_t pmap_allocpte __P((pmap_t pmap, vm_offset_t va));
-
-static int pmap_release_free_page __P((pmap_t pmap, vm_page_t p));
-static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex));
-static pt_entry_t *pmap_pte_quick __P((pmap_t pmap, vm_offset_t va));
-static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex));
-static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t));
+static PMAP_INLINE void	free_pv_entry(pv_entry_t pv);
+static pt_entry_t *get_ptbase(pmap_t pmap);
+static pv_entry_t get_pv_entry(void);
+static void	i386_protection_init(void);
+static __inline void	pmap_changebit(vm_page_t m, int bit, boolean_t setem);
+
+static void	pmap_remove_all(vm_page_t m);
+static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va,
+				      vm_page_t m, vm_page_t mpte);
+static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
+static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
+static int pmap_remove_entry(struct pmap *pmap, vm_page_t m,
+					vm_offset_t va);
+static boolean_t pmap_testbit(vm_page_t m, int bit);
+static void pmap_insert_entry(pmap_t pmap, vm_offset_t va,
+		vm_page_t mpte, vm_page_t m);
+
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va);
+
+static int pmap_release_free_page(pmap_t pmap, vm_page_t p);
+static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex);
+static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va);
+static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex);
+static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
 static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
 static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait);
 
@@ -3555,8 +3555,8 @@ pmap_pid_dump(int pid)
 
 #if defined(DEBUG)
 
-static void	pads __P((pmap_t pm));
-void		pmap_pvdump __P((vm_offset_t pa));
+static void	pads(pmap_t pm);
+void		pmap_pvdump(vm_offset_t pa);
 
 /* print address space of pmap*/
 static void
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 58e1a22..ba47686 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -66,12 +66,12 @@
 
 
 
-static int i386_get_ldt	__P((struct thread *, char *));
-static int i386_set_ldt	__P((struct thread *, char *));
-static int i386_get_ioperm	__P((struct thread *, char *));
-static int i386_set_ioperm	__P((struct thread *, char *));
+static int i386_get_ldt	(struct thread *, char *);
+static int i386_set_ldt	(struct thread *, char *);
+static int i386_get_ioperm	(struct thread *, char *);
+static int i386_set_ioperm	(struct thread *, char *);
 #ifdef SMP
-static void set_user_ldt_rv	__P((struct thread *));
+static void set_user_ldt_rv	(struct thread *);
 #endif
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index a454803..57d1dea 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -100,17 +100,17 @@
 
 #include <sys/sysctl.h>
 
-int (*pmath_emulate) __P((struct trapframe *));
+int (*pmath_emulate)(struct trapframe *);
 
-extern void trap __P((struct trapframe frame));
+extern void trap(struct trapframe frame);
 #ifdef I386_CPU
-extern int trapwrite __P((unsigned addr));
+extern int trapwrite(unsigned addr);
 #endif
-extern void syscall __P((struct trapframe frame));
+extern void syscall(struct trapframe frame);
 
-static int trap_pfault __P((struct trapframe *, int, vm_offset_t));
-static void trap_fatal __P((struct trapframe *, vm_offset_t));
-void dblfault_handler __P((void));
+static int trap_pfault(struct trapframe *, int, vm_offset_t);
+static void trap_fatal(struct trapframe *, vm_offset_t);
+void dblfault_handler(void);
 
 extern inthand_t IDTVEC(lcall_syscall);
 
@@ -166,7 +166,7 @@ extern char *syscallnames[];
 
 #ifdef DEVICE_POLLING
 extern u_int32_t poll_in_trap;
-extern int ether_poll __P((int count));
+extern int ether_poll(int count);
 #endif /* DEVICE_POLLING */
 
 /*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 01e4b30..cc4c37a 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -86,9 +86,9 @@
 #include <i386/isa/isa.h>
 #endif
 
-static void	cpu_reset_real __P((void));
+static void	cpu_reset_real(void);
 #ifdef SMP
-static void	cpu_reset_proxy __P((void));
+static void	cpu_reset_proxy(void);
 static u_int	cpu_reset_proxyid;
 static volatile u_int	cpu_reset_proxy_active;
 #endif
@@ -241,7 +241,7 @@ cpu_fork(td1, p2, td2, flags)
 void
 cpu_set_fork_handler(td, func, arg)
 	struct thread *td;
-	void (*func) __P((void *));
+	void (*func)(void *);
 	void *arg;
 {
 	/*
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index e3dd31a..9643191 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index ded252b..59b1c59 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -145,37 +145,37 @@
 /**************************************************************
  * Declarations
  **************************************************************/
-/* static */ void scsi_low_info __P((struct scsi_low_softc *, struct targ_info *, u_char *));
-static void scsi_low_engage __P((void *));
-static struct slccb *scsi_low_establish_ccb __P((struct targ_info *, struct lun_info *, scsi_low_tag_t));
-static int scsi_low_done __P((struct scsi_low_softc *, struct slccb *));
-static int scsi_low_setup_done __P((struct scsi_low_softc *, struct slccb *));
-static void scsi_low_bus_release __P((struct scsi_low_softc *, struct targ_info *));
-static void scsi_low_twiddle_wait __P((void));
-static struct lun_info *scsi_low_alloc_li __P((struct targ_info *, int, int));
-static struct targ_info *scsi_low_alloc_ti __P((struct scsi_low_softc *, int));
-static void scsi_low_calcf_lun __P((struct lun_info *));
-static void scsi_low_calcf_target __P((struct targ_info *));
-static void scsi_low_calcf_show __P((struct lun_info *));
-static void scsi_low_reset_nexus __P((struct scsi_low_softc *, int));
-static void scsi_low_reset_nexus_target __P((struct scsi_low_softc *, struct targ_info *, int));
-static void scsi_low_reset_nexus_lun __P((struct scsi_low_softc *, struct lun_info *, int));
-static int scsi_low_init __P((struct scsi_low_softc *, u_int));
-static void scsi_low_start __P((struct scsi_low_softc *));
-static void scsi_low_free_ti __P((struct scsi_low_softc *));
-
-static int scsi_low_alloc_qtag __P((struct slccb *));
-static int scsi_low_dealloc_qtag __P((struct slccb *));
-static int scsi_low_enqueue __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *, u_int, u_int));
-static int scsi_low_message_enqueue __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, u_int));
-static void scsi_low_unit_ready_cmd __P((struct slccb *));
-static void scsi_low_timeout __P((void *));
-static int scsi_low_timeout_check __P((struct scsi_low_softc *));
+/* static */ void scsi_low_info(struct scsi_low_softc *, struct targ_info *, u_char *);
+static void scsi_low_engage(void *);
+static struct slccb *scsi_low_establish_ccb(struct targ_info *, struct lun_info *, scsi_low_tag_t);
+static int scsi_low_done(struct scsi_low_softc *, struct slccb *);
+static int scsi_low_setup_done(struct scsi_low_softc *, struct slccb *);
+static void scsi_low_bus_release(struct scsi_low_softc *, struct targ_info *);
+static void scsi_low_twiddle_wait(void);
+static struct lun_info *scsi_low_alloc_li(struct targ_info *, int, int);
+static struct targ_info *scsi_low_alloc_ti(struct scsi_low_softc *, int);
+static void scsi_low_calcf_lun(struct lun_info *);
+static void scsi_low_calcf_target(struct targ_info *);
+static void scsi_low_calcf_show(struct lun_info *);
+static void scsi_low_reset_nexus(struct scsi_low_softc *, int);
+static void scsi_low_reset_nexus_target(struct scsi_low_softc *, struct targ_info *, int);
+static void scsi_low_reset_nexus_lun(struct scsi_low_softc *, struct lun_info *, int);
+static int scsi_low_init(struct scsi_low_softc *, u_int);
+static void scsi_low_start(struct scsi_low_softc *);
+static void scsi_low_free_ti(struct scsi_low_softc *);
+
+static int scsi_low_alloc_qtag(struct slccb *);
+static int scsi_low_dealloc_qtag(struct slccb *);
+static int scsi_low_enqueue(struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *, u_int, u_int);
+static int scsi_low_message_enqueue(struct scsi_low_softc *, struct targ_info *, struct lun_info *, u_int);
+static void scsi_low_unit_ready_cmd(struct slccb *);
+static void scsi_low_timeout(void *);
+static int scsi_low_timeout_check(struct scsi_low_softc *);
 #ifdef	SCSI_LOW_START_UP_CHECK
-static int scsi_low_start_up __P((struct scsi_low_softc *));
+static int scsi_low_start_up(struct scsi_low_softc *);
 #endif	/* SCSI_LOW_START_UP_CHECK */
-static int scsi_low_abort_ccb __P((struct scsi_low_softc *, struct slccb *));
-static struct slccb *scsi_low_revoke_ccb __P((struct scsi_low_softc *, struct slccb *, int));
+static int scsi_low_abort_ccb(struct scsi_low_softc *, struct slccb *);
+static struct slccb *scsi_low_revoke_ccb(struct scsi_low_softc *, struct slccb *, int);
 
 int scsi_low_version_major = 2;
 int scsi_low_version_minor = 17;
@@ -217,9 +217,9 @@ int scsi_low_debug = 0;
 int scsi_low_test = 0;
 int scsi_low_test_id = 0;
 
-static void scsi_low_test_abort __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *));
-static void scsi_low_test_cmdlnk __P((struct scsi_low_softc *, struct slccb *));
-static void scsi_low_test_atten __P((struct scsi_low_softc *, struct targ_info *, u_int));
+static void scsi_low_test_abort(struct scsi_low_softc *, struct targ_info *, struct lun_info *);
+static void scsi_low_test_cmdlnk(struct scsi_low_softc *, struct slccb *);
+static void scsi_low_test_atten(struct scsi_low_softc *, struct targ_info *, u_int);
 #define	SCSI_LOW_DEBUG_TEST_GO(fl, id) \
 	((scsi_low_test & (fl)) != 0 && (scsi_low_test_id & (1 << (id))) == 0)
 #define	SCSI_LOW_DEBUG_GO(fl, id) \
@@ -236,13 +236,13 @@ GENERIC_CCB(scsi_low, slccb, ccb_chain)
  * Inline functions
  **************************************************************/
 #define	SCSI_LOW_INLINE	static __inline
-SCSI_LOW_INLINE void scsi_low_activate_qtag __P((struct slccb *));
-SCSI_LOW_INLINE void scsi_low_deactivate_qtag __P((struct slccb *));
-SCSI_LOW_INLINE void scsi_low_ccb_message_assert __P((struct slccb *, u_int));
-SCSI_LOW_INLINE void scsi_low_ccb_message_exec __P((struct scsi_low_softc *, struct slccb *));
-SCSI_LOW_INLINE void scsi_low_ccb_message_retry __P((struct slccb *));
-SCSI_LOW_INLINE void scsi_low_ccb_message_clear __P((struct slccb *));
-SCSI_LOW_INLINE void scsi_low_init_msgsys __P((struct scsi_low_softc *, struct targ_info *));
+SCSI_LOW_INLINE void scsi_low_activate_qtag(struct slccb *);
+SCSI_LOW_INLINE void scsi_low_deactivate_qtag(struct slccb *);
+SCSI_LOW_INLINE void scsi_low_ccb_message_assert(struct slccb *, u_int);
+SCSI_LOW_INLINE void scsi_low_ccb_message_exec(struct scsi_low_softc *, struct slccb *);
+SCSI_LOW_INLINE void scsi_low_ccb_message_retry(struct slccb *);
+SCSI_LOW_INLINE void scsi_low_ccb_message_clear(struct slccb *);
+SCSI_LOW_INLINE void scsi_low_init_msgsys(struct scsi_low_softc *, struct targ_info *);
 
 SCSI_LOW_INLINE void
 scsi_low_activate_qtag(cb)
@@ -336,8 +336,8 @@ struct scsi_low_error_code {
 	int error_code;
 };
 
-static struct slccb *scsi_low_find_ccb __P((struct scsi_low_softc *, u_int, u_int, void *));
-static int scsi_low_translate_error_code __P((struct slccb *, struct scsi_low_error_code *));
+static struct slccb *scsi_low_find_ccb(struct scsi_low_softc *, u_int, u_int, void *);
+static int scsi_low_translate_error_code(struct slccb *, struct scsi_low_error_code *);
 
 static struct slccb *
 scsi_low_find_ccb(slp, target, lun, osdep)
@@ -397,23 +397,23 @@ scsi_low_translate_error_code(cb, tp)
 #define	SCSI_LOW_ALLOC_CCB(flags)	scsi_low_get_ccb((flags))
 #define	SCSI_LOW_XS_POLL_HZ		1000
 
-static int scsi_low_poll_xs __P((struct scsi_low_softc *, struct slccb *));
-static void scsi_low_scsi_minphys_xs __P((struct buf *));
+static int scsi_low_poll_xs(struct scsi_low_softc *, struct slccb *);
+static void scsi_low_scsi_minphys_xs(struct buf *);
 #ifdef	SCSI_LOW_TARGET_OPEN
-static int scsi_low_target_open __P((struct scsipi_link *, struct cfdata *));
+static int scsi_low_target_open(struct scsipi_link *, struct cfdata *);
 #endif	/* SCSI_LOW_TARGET_OPEN */
-static int scsi_low_scsi_cmd_xs __P((struct scsipi_xfer *));
-static int scsi_low_enable_xs __P((void *, int));
-static int scsi_low_ioctl_xs __P((struct scsipi_link *, u_long, caddr_t, int, struct proc *));
-
-static int scsi_low_attach_xs __P((struct scsi_low_softc *));
-static int scsi_low_world_start_xs __P((struct scsi_low_softc *));
-static int scsi_low_dettach_xs __P((struct scsi_low_softc *));
-static int scsi_low_ccb_setup_xs __P((struct scsi_low_softc *, struct slccb *));
-static int scsi_low_done_xs __P((struct scsi_low_softc *, struct slccb *));
-static void scsi_low_timeout_xs __P((struct scsi_low_softc *, int, int));
-static u_int scsi_low_translate_quirks_xs __P((u_int));
-static void scsi_low_setup_quirks_xs __P((struct targ_info *, struct lun_info *, u_int));
+static int scsi_low_scsi_cmd_xs(struct scsipi_xfer *);
+static int scsi_low_enable_xs(void *, int);
+static int scsi_low_ioctl_xs(struct scsipi_link *, u_long, caddr_t, int, struct proc *);
+
+static int scsi_low_attach_xs(struct scsi_low_softc *);
+static int scsi_low_world_start_xs(struct scsi_low_softc *);
+static int scsi_low_dettach_xs(struct scsi_low_softc *);
+static int scsi_low_ccb_setup_xs(struct scsi_low_softc *, struct slccb *);
+static int scsi_low_done_xs(struct scsi_low_softc *, struct slccb *);
+static void scsi_low_timeout_xs(struct scsi_low_softc *, int, int);
+static u_int scsi_low_translate_quirks_xs(u_int);
+static void scsi_low_setup_quirks_xs(struct targ_info *, struct lun_info *, u_int);
 
 struct scsi_low_osdep_funcs scsi_low_osdep_funcs_xs = {
 	scsi_low_attach_xs,
@@ -886,17 +886,17 @@ scsi_low_target_open(link, cf)
 #define	SCSI_LOW_FREE(pt)		free((pt), M_DEVBUF)
 #define	SCSI_LOW_ALLOC_CCB(flags)	scsi_low_get_ccb()
 
-static void scsi_low_poll_cam __P((struct cam_sim *));
-static void scsi_low_cam_rescan_callback __P((struct cam_periph *, union ccb *));
-static void scsi_low_rescan_bus_cam __P((struct scsi_low_softc *));
-void scsi_low_scsi_action_cam __P((struct cam_sim *, union ccb *));
+static void scsi_low_poll_cam(struct cam_sim *);
+static void scsi_low_cam_rescan_callback(struct cam_periph *, union ccb *);
+static void scsi_low_rescan_bus_cam(struct scsi_low_softc *);
+void scsi_low_scsi_action_cam(struct cam_sim *, union ccb *);
 
-static int scsi_low_attach_cam __P((struct scsi_low_softc *));
-static int scsi_low_world_start_cam __P((struct scsi_low_softc *));
-static int scsi_low_dettach_cam __P((struct scsi_low_softc *));
-static int scsi_low_ccb_setup_cam __P((struct scsi_low_softc *, struct slccb *));
-static int scsi_low_done_cam __P((struct scsi_low_softc *, struct slccb *));
-static void scsi_low_timeout_cam __P((struct scsi_low_softc *, int, int));
+static int scsi_low_attach_cam(struct scsi_low_softc *);
+static int scsi_low_world_start_cam(struct scsi_low_softc *);
+static int scsi_low_dettach_cam(struct scsi_low_softc *);
+static int scsi_low_ccb_setup_cam(struct scsi_low_softc *, struct slccb *);
+static int scsi_low_done_cam(struct scsi_low_softc *, struct slccb *);
+static void scsi_low_timeout_cam(struct scsi_low_softc *, int, int);
 
 struct scsi_low_osdep_funcs scsi_low_osdep_funcs_cam = {
 	scsi_low_attach_cam,
@@ -1651,10 +1651,9 @@ scsi_low_activate(slp)
  * scsi low log
  **************************************************************/
 #ifdef	SCSI_LOW_DIAGNOSTIC
-static void scsi_low_msg_log_init __P((struct scsi_low_msg_log *));
-static void scsi_low_msg_log_write __P((struct scsi_low_msg_log *, u_int8_t *,
-int));
-static void scsi_low_msg_log_show __P((struct scsi_low_msg_log *, char *, int));
+static void scsi_low_msg_log_init(struct scsi_low_msg_log *);
+static void scsi_low_msg_log_write(struct scsi_low_msg_log *, u_int8_t *, int);
+static void scsi_low_msg_log_show(struct scsi_low_msg_log *, char *, int);
 
 static void
 scsi_low_msg_log_init(slmlp)
@@ -2295,9 +2294,9 @@ static u_int8_t sms_cmd[6] = {SLSC_MODE_SENSE_SHORT, 0x08, 0x0a, 0,
 static u_int8_t inq_cmd[6] = {INQUIRY, 0, 0, 0, 
 			      sizeof(struct scsi_low_inq_data), 0}; 
 static u_int8_t unit_ready_cmd[6];
-static int scsi_low_setup_start __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *));
-static int scsi_low_sense_abort_start __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *));
-static int scsi_low_resume __P((struct scsi_low_softc *));
+static int scsi_low_setup_start(struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *);
+static int scsi_low_sense_abort_start(struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *);
+static int scsi_low_resume(struct scsi_low_softc *);
 
 static void
 scsi_low_unit_ready_cmd(cb)
@@ -3249,24 +3248,24 @@ scsi_low_data(slp, ti, bp, direction)
 #define	MSGIN_WIDTHP(ti) ((ti)->ti_msgin[3])
 #define	MSGIN_DATA_LAST	0x30
 
-static int scsi_low_errfunc_synch __P((struct scsi_low_softc *, u_int));
-static int scsi_low_errfunc_wide __P((struct scsi_low_softc *, u_int));
-static int scsi_low_errfunc_identify __P((struct scsi_low_softc *, u_int));
-static int scsi_low_errfunc_qtag __P((struct scsi_low_softc *, u_int));
+static int scsi_low_errfunc_synch(struct scsi_low_softc *, u_int);
+static int scsi_low_errfunc_wide(struct scsi_low_softc *, u_int);
+static int scsi_low_errfunc_identify(struct scsi_low_softc *, u_int);
+static int scsi_low_errfunc_qtag(struct scsi_low_softc *, u_int);
 
-static int scsi_low_msgfunc_synch __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_wide __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_identify __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_abort __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_qabort __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_qtag __P((struct scsi_low_softc *));
-static int scsi_low_msgfunc_reset __P((struct scsi_low_softc *));
+static int scsi_low_msgfunc_synch(struct scsi_low_softc *);
+static int scsi_low_msgfunc_wide(struct scsi_low_softc *);
+static int scsi_low_msgfunc_identify(struct scsi_low_softc *);
+static int scsi_low_msgfunc_abort(struct scsi_low_softc *);
+static int scsi_low_msgfunc_qabort(struct scsi_low_softc *);
+static int scsi_low_msgfunc_qtag(struct scsi_low_softc *);
+static int scsi_low_msgfunc_reset(struct scsi_low_softc *);
 
 struct scsi_low_msgout_data {
 	u_int	md_flags;
 	u_int8_t md_msg;
-	int (*md_msgfunc) __P((struct scsi_low_softc *));
-	int (*md_errfunc) __P((struct scsi_low_softc *, u_int));
+	int (*md_msgfunc)(struct scsi_low_softc *);
+	int (*md_errfunc)(struct scsi_low_softc *, u_int);
 #define	MSG_RELEASE_ATN	0x0001
 	u_int md_condition;
 };
@@ -3290,24 +3289,24 @@ struct scsi_low_msgout_data scsi_low_msgout_data[] = {
 /* 15 */{SCSI_LOW_MSG_ALL, 0},
 };
 
-static int scsi_low_msginfunc_ext __P((struct scsi_low_softc *));
-static int scsi_low_synch __P((struct scsi_low_softc *));
-static int scsi_low_wide __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_msg_reject __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_rejop __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_rp __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_sdp __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_disc __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_cc __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_lcc __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_parity __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_noop __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_simple_qtag __P((struct scsi_low_softc *));
-static int scsi_low_msginfunc_i_wide_residue __P((struct scsi_low_softc *));
+static int scsi_low_msginfunc_ext(struct scsi_low_softc *);
+static int scsi_low_synch(struct scsi_low_softc *);
+static int scsi_low_wide(struct scsi_low_softc *);
+static int scsi_low_msginfunc_msg_reject(struct scsi_low_softc *);
+static int scsi_low_msginfunc_rejop(struct scsi_low_softc *);
+static int scsi_low_msginfunc_rp(struct scsi_low_softc *);
+static int scsi_low_msginfunc_sdp(struct scsi_low_softc *);
+static int scsi_low_msginfunc_disc(struct scsi_low_softc *);
+static int scsi_low_msginfunc_cc(struct scsi_low_softc *);
+static int scsi_low_msginfunc_lcc(struct scsi_low_softc *);
+static int scsi_low_msginfunc_parity(struct scsi_low_softc *);
+static int scsi_low_msginfunc_noop(struct scsi_low_softc *);
+static int scsi_low_msginfunc_simple_qtag(struct scsi_low_softc *);
+static int scsi_low_msginfunc_i_wide_residue(struct scsi_low_softc *);
 
 struct scsi_low_msgin_data {
 	u_int md_len;
-	int (*md_msgfunc) __P((struct scsi_low_softc *));
+	int (*md_msgfunc)(struct scsi_low_softc *);
 };
 
 struct scsi_low_msgin_data scsi_low_msgin_data[] = {
@@ -4666,7 +4665,7 @@ scsi_low_calcf_show(li)
 /**************************************************************
  * scsi world start up
  **************************************************************/
-static int scsi_low_poll __P((struct scsi_low_softc *, struct slccb *));
+static int scsi_low_poll(struct scsi_low_softc *, struct slccb *);
 
 static int
 scsi_low_start_up(slp)
diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index fb377c8..31229a7 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -146,17 +146,17 @@ struct scsi_low_softc;
 
 struct scsi_low_osdep_funcs {
 	int (*scsi_low_osdep_attach) \
-			__P((struct scsi_low_softc *));
+			(struct scsi_low_softc *);
 	int (*scsi_low_osdep_world_start) \
-			__P((struct scsi_low_softc *));
+			(struct scsi_low_softc *);
 	int (*scsi_low_osdep_dettach) \
-			__P((struct scsi_low_softc *));
+			(struct scsi_low_softc *);
 	int (*scsi_low_osdep_ccb_setup) \
-			__P((struct scsi_low_softc *, struct slccb *));
+			(struct scsi_low_softc *, struct slccb *);
 	int (*scsi_low_osdep_done) \
-			__P((struct scsi_low_softc *, struct slccb *));
+			(struct scsi_low_softc *, struct slccb *);
 	void (*scsi_low_osdep_timeout) \
-			__P((struct scsi_low_softc *, int, int));
+			(struct scsi_low_softc *, int, int);
 };
 
 /*================================================
@@ -513,32 +513,32 @@ typedef struct scsi_low_softc *sc_low_t;
 #define	SCSI_LOW_POWDOWN	1
 #define	SCSI_LOW_ENGAGE		2
 
-#define	SC_LOW_INIT_T (int (*) __P((sc_low_t, int)))
-#define	SC_LOW_BUSRST_T (void (*) __P((sc_low_t)))
-#define	SC_LOW_TARG_INIT_T (int (*) __P((sc_low_t, struct targ_info *, int)))
-#define	SC_LOW_LUN_INIT_T (int (*) __P((sc_low_t, struct targ_info *, struct lun_info *, int)))
-#define	SC_LOW_SELECT_T (int (*) __P((sc_low_t, struct slccb *)))
-#define	SC_LOW_ATTEN_T (void (*) __P((sc_low_t)))
-#define	SC_LOW_NEXUS_T (int (*) __P((sc_low_t)))
-#define	SC_LOW_MSG_T (int (*) __P((sc_low_t, struct targ_info *, u_int)))
-#define	SC_LOW_POLL_T (int (*) __P((void *)))
-#define	SC_LOW_POWER_T (int (*) __P((sc_low_t, u_int)))
-#define	SC_LOW_TIMEOUT_T (int (*) __P((sc_low_t)))
+#define	SC_LOW_INIT_T (int (*)(sc_low_t, int))
+#define	SC_LOW_BUSRST_T (void (*)(sc_low_t))
+#define	SC_LOW_TARG_INIT_T (int (*)(sc_low_t, struct targ_info *, int))
+#define	SC_LOW_LUN_INIT_T (int (*)(sc_low_t, struct targ_info *, struct lun_info *, int))
+#define	SC_LOW_SELECT_T (int (*)(sc_low_t, struct slccb *))
+#define	SC_LOW_ATTEN_T (void (*)(sc_low_t))
+#define	SC_LOW_NEXUS_T (int (*)(sc_low_t))
+#define	SC_LOW_MSG_T (int (*)(sc_low_t, struct targ_info *, u_int))
+#define	SC_LOW_POLL_T (int (*)(void *))
+#define	SC_LOW_POWER_T (int (*)(sc_low_t, u_int))
+#define	SC_LOW_TIMEOUT_T (int (*)(sc_low_t))
 
 struct scsi_low_funcs {
-	int (*scsi_low_init) __P((sc_low_t, int));
-	void (*scsi_low_bus_reset) __P((sc_low_t));
-	int (*scsi_low_targ_init) __P((sc_low_t, struct targ_info *, int));
-	int (*scsi_low_lun_init) __P((sc_low_t, struct targ_info *, struct lun_info *, int));
-	int (*scsi_low_start_bus) __P((sc_low_t, struct slccb *));
-	int (*scsi_low_establish_lun_nexus) __P((sc_low_t));
-	int (*scsi_low_establish_ccb_nexus) __P((sc_low_t));
-	void (*scsi_low_attention) __P((sc_low_t));
-	int (*scsi_low_msg) __P((sc_low_t, struct targ_info *, u_int));
-	int (*scsi_low_timeout) __P((sc_low_t));
-	int (*scsi_low_poll) __P((void *));
-	int (*scsi_low_power) __P((sc_low_t, u_int));
-	int (*scsi_low_ioctl) __P((sc_low_t, u_long, caddr_t, int, struct proc *));
+	int (*scsi_low_init)(sc_low_t, int);
+	void (*scsi_low_bus_reset)(sc_low_t);
+	int (*scsi_low_targ_init)(sc_low_t, struct targ_info *, int);
+	int (*scsi_low_lun_init)(sc_low_t, struct targ_info *, struct lun_info *, int);
+	int (*scsi_low_start_bus)(sc_low_t, struct slccb *);
+	int (*scsi_low_establish_lun_nexus)(sc_low_t);
+	int (*scsi_low_establish_ccb_nexus)(sc_low_t);
+	void (*scsi_low_attention)(sc_low_t);
+	int (*scsi_low_msg)(sc_low_t, struct targ_info *, u_int);
+	int (*scsi_low_timeout)(sc_low_t);
+	int (*scsi_low_poll)(void *);
+	int (*scsi_low_power)(sc_low_t, u_int);
+	int (*scsi_low_ioctl)(sc_low_t, u_long, caddr_t, int, struct proc *);
 };
 
 struct scsi_low_softc {
@@ -663,51 +663,51 @@ struct scsi_low_softc {
 /* 
  * Scsi low attachment function.
  */
-int scsi_low_attach __P((struct scsi_low_softc *, int, int, int, int, int));
-int scsi_low_dettach __P((struct scsi_low_softc *));
+int scsi_low_attach(struct scsi_low_softc *, int, int, int, int, int);
+int scsi_low_dettach(struct scsi_low_softc *);
 
 /* 
  * Scsi low interface activate or deactivate functions
  */
-int scsi_low_is_busy __P((struct scsi_low_softc *));
-int scsi_low_activate __P((struct scsi_low_softc *));
-int scsi_low_deactivate __P((struct scsi_low_softc *));
+int scsi_low_is_busy(struct scsi_low_softc *);
+int scsi_low_activate(struct scsi_low_softc *);
+int scsi_low_deactivate(struct scsi_low_softc *);
 
 /* 
  * Scsi phase "bus service" functions.
  * These functions are corresponding to each scsi bus phaeses.
  */
 /* bus idle phase (other initiators or targets release bus) */
-void scsi_low_bus_idle __P((struct scsi_low_softc *));
+void scsi_low_bus_idle(struct scsi_low_softc *);
 
 /* arbitration and selection phase */
-void scsi_low_arbit_fail __P((struct scsi_low_softc *, struct slccb *));
-static __inline void scsi_low_arbit_win __P((struct scsi_low_softc *));
+void scsi_low_arbit_fail(struct scsi_low_softc *, struct slccb *);
+static __inline void scsi_low_arbit_win(struct scsi_low_softc *);
 
 /* msgout phase */
 #define	SCSI_LOW_MSGOUT_INIT		0x00000001
 #define	SCSI_LOW_MSGOUT_UNIFY		0x00000002
-int scsi_low_msgout __P((struct scsi_low_softc *, struct targ_info *, u_int));
+int scsi_low_msgout(struct scsi_low_softc *, struct targ_info *, u_int);
 
 /* msgin phase */
 #define SCSI_LOW_DATA_PE	0x80000000
-int scsi_low_msgin __P((struct scsi_low_softc *, struct targ_info *, u_int));
+int scsi_low_msgin(struct scsi_low_softc *, struct targ_info *, u_int);
 
 /* statusin phase */
-static __inline int scsi_low_statusin __P((struct scsi_low_softc *, struct targ_info *, u_int));
+static __inline int scsi_low_statusin(struct scsi_low_softc *, struct targ_info *, u_int);
 
 /* data phase */
-int scsi_low_data __P((struct scsi_low_softc *, struct targ_info *, struct buf **, int));
-static __inline void scsi_low_data_finish __P((struct scsi_low_softc *));
+int scsi_low_data(struct scsi_low_softc *, struct targ_info *, struct buf **, int);
+static __inline void scsi_low_data_finish(struct scsi_low_softc *);
 
 /* cmd phase */
-int scsi_low_cmd __P((struct scsi_low_softc *, struct targ_info *));
+int scsi_low_cmd(struct scsi_low_softc *, struct targ_info *);
 
 /* reselection phase */
-struct targ_info *scsi_low_reselected __P((struct scsi_low_softc *, u_int));
+struct targ_info *scsi_low_reselected(struct scsi_low_softc *, u_int);
 
 /* disconnection phase */
-int scsi_low_disconnected __P((struct scsi_low_softc *, struct targ_info *));
+int scsi_low_disconnected(struct scsi_low_softc *, struct targ_info *);
 
 /* 
  * Scsi bus restart function.
@@ -715,16 +715,16 @@ int scsi_low_disconnected __P((struct scsi_low_softc *, struct targ_info *));
  */
 #define	SCSI_LOW_RESTART_HARD	1
 #define	SCSI_LOW_RESTART_SOFT	0
-int scsi_low_restart __P((struct scsi_low_softc *, int, u_char *));
+int scsi_low_restart(struct scsi_low_softc *, int, u_char *);
 
 /* 
  * Scsi utility fucntions
  */
 /* print current status */
-void scsi_low_print __P((struct scsi_low_softc *, struct targ_info *));
+void scsi_low_print(struct scsi_low_softc *, struct targ_info *);
 
 /* bus reset utility */
-void scsi_low_bus_reset __P((struct scsi_low_softc *));
+void scsi_low_bus_reset(struct scsi_low_softc *);
 
 /*************************************************
  * Message macro defs
@@ -753,10 +753,10 @@ void scsi_low_bus_reset __P((struct scsi_low_softc *));
 /*************************************************
  * Inline functions
  *************************************************/
-static __inline void scsi_low_attention __P((struct scsi_low_softc *));
-static __inline int scsi_low_is_msgout_continue __P((struct targ_info *, u_int));
-static __inline int scsi_low_assert_msg __P((struct scsi_low_softc *, struct targ_info *, u_int, int));
-static __inline int scsi_low_is_disconnect_ok __P((struct slccb *));
+static __inline void scsi_low_attention(struct scsi_low_softc *);
+static __inline int scsi_low_is_msgout_continue(struct targ_info *, u_int);
+static __inline int scsi_low_assert_msg(struct scsi_low_softc *, struct targ_info *, u_int, int);
+static __inline int scsi_low_is_disconnect_ok(struct slccb *);
 
 static __inline int
 scsi_low_is_msgout_continue(ti, mask)
diff --git a/sys/cam/scsi/scsi_low_pisa.h b/sys/cam/scsi/scsi_low_pisa.h
index f890a06..1e0916c 100644
--- a/sys/cam/scsi/scsi_low_pisa.h
+++ b/sys/cam/scsi/scsi_low_pisa.h
@@ -35,13 +35,13 @@
 #define	_SCSI_LOW_PISA_H_
 
 #ifdef	__NetBSD__
-int scsi_low_activate_pisa __P((pisa_device_handle_t));
-int scsi_low_deactivate_pisa __P((pisa_device_handle_t));
-int scsi_low_notify_pisa __P((pisa_device_handle_t, pisa_event_t));
+int scsi_low_activate_pisa(pisa_device_handle_t);
+int scsi_low_deactivate_pisa(pisa_device_handle_t);
+int scsi_low_notify_pisa(pisa_device_handle_t, pisa_event_t);
 #endif	/* __NetBSD__ */
 
 #ifdef	__FreeBSD__
-int scsi_low_activate_pisa __P((struct scsi_low_softc *, int));
-int scsi_low_deactivate_pisa __P((struct scsi_low_softc *));
+int scsi_low_activate_pisa(struct scsi_low_softc *, int);
+int scsi_low_deactivate_pisa(struct scsi_low_softc *);
 #endif	/* __FreeBSD__ */
 #endif	/* !_SCSI_LOW_PISA_H_ */
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 17700dc..a14cb69 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -153,25 +153,25 @@ TAILQ_HEAD(cs_tailq, critical_section);
 SLIST_HEAD(scope_list, scope);
 TAILQ_HEAD(scope_tailq, scope);
 
-void	symbol_delete __P((symbol_t *symbol));
+void	symbol_delete(symbol_t *symbol);
 
-void	symtable_open __P((void));
+void	symtable_open(void);
 
-void	symtable_close __P((void));
+void	symtable_close(void);
 
 symbol_t *
-	symtable_get __P((char *name));
+	symtable_get(char *name);
 
 symbol_node_t *
-	symlist_search __P((symlist_t *symlist, char *symname));
+	symlist_search(symlist_t *symlist, char *symname);
 
 void
-	symlist_add __P((symlist_t *symlist, symbol_t *symbol, int how));
+	symlist_add(symlist_t *symlist, symbol_t *symbol, int how);
 #define SYMLIST_INSERT_HEAD	0x00
 #define SYMLIST_SORT		0x01
 
-void	symlist_free __P((symlist_t *symlist));
+void	symlist_free(symlist_t *symlist);
 
-void	symlist_merge __P((symlist_t *symlist_dest, symlist_t *symlist_src1,
-			   symlist_t *symlist_src2));
-void	symtable_dump __P((FILE *ofile));
+void	symlist_merge(symlist_t *symlist_dest, symlist_t *symlist_src1,
+			   symlist_t *symlist_src2);
+void	symtable_dump(FILE *ofile);
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index af2cb5f..232f629 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -91,9 +91,9 @@
 device_t isa_bus_device = 0;
 #endif
 
-static void	configure_first __P((void *));
-static void	configure __P((void *));
-static void	configure_final __P((void *));
+static void	configure_first(void *);
+static void	configure(void *);
+static void	configure_final(void *);
 
 #if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT)
 static void	pxe_setup_nfsdiskless(void);
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index e742764..43e6d1f 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -861,13 +861,13 @@ static const int db_lengths[] = {
 	(loc) += (size);
 
 static db_addr_t
-		db_disasm_esc __P((db_addr_t loc, int inst, int short_addr,
-				   int size, const char *seg));
-static void	db_print_address __P((const char *seg, int size,
-				      struct i_addr *addrp));
+		db_disasm_esc(db_addr_t loc, int inst, int short_addr,
+				   int size, const char *seg);
+static void	db_print_address(const char *seg, int size,
+				      struct i_addr *addrp);
 static db_addr_t
-		db_read_address __P((db_addr_t loc, int short_addr,
-				     int regmodrm, struct i_addr *addrp));
+		db_read_address(db_addr_t loc, int short_addr,
+				     int regmodrm, struct i_addr *addrp);
 
 /*
  * Read address at location and return updated location.
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index bb5a5b1..2ba81da 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -52,7 +52,7 @@
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;
 
-extern void	gdb_handle_exception __P((db_regs_t *, int, int));
+extern void	gdb_handle_exception(db_regs_t *, int, int);
 
 int	db_active;
 db_regs_t ddb_regs;
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 6a07631..c9324e7 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -104,19 +104,19 @@ struct i386_frame {
 #define	INTERRUPT	2
 #define	SYSCALL		3
 
-static void db_nextframe __P((struct i386_frame **, db_addr_t *, struct proc *));
-static int db_numargs __P((struct i386_frame *));
-static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t));
-static void decode_syscall __P((int, struct proc *));
-
-
-static char * watchtype_str __P((int type));
-int  i386_set_watch         __P((int watchnum, unsigned int watchaddr, 
-                                 int size, int access, struct dbreg * d));
-int  i386_clr_watch         __P((int watchnum, struct dbreg * d));
-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));
+static void db_nextframe(struct i386_frame **, db_addr_t *, struct proc *);
+static int db_numargs(struct i386_frame *);
+static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t);
+static void decode_syscall(int, struct proc *);
+
+
+static char * watchtype_str(int type);
+int  i386_set_watch(int watchnum, unsigned int watchaddr, 
+                                 int size, int access, struct dbreg * d);
+int  i386_clr_watch(int watchnum, struct dbreg * d);
+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);
 
 
 /*
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 5859004..ff8f10c 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -119,8 +119,8 @@
 #include <sys/ptrace.h>
 #include <machine/sigframe.h>
 
-extern void init386 __P((int first));
-extern void dblfault_handler __P((void));
+extern void init386(int first);
+extern void dblfault_handler(void);
 
 extern void printcpuinfo(void);	/* XXX header file */
 extern void earlysetcpuclass(void);	/* same header file */
@@ -131,10 +131,10 @@ extern void initializecpu(void);
 #define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
 #define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 
-static void cpu_startup __P((void *));
+static void cpu_startup(void *);
 #ifdef CPU_ENABLE_SSE
-static void set_fpregs_xmm __P((struct save87 *, struct savexmm *));
-static void fill_fpregs_xmm __P((struct savexmm *, struct save87 *));
+static void set_fpregs_xmm(struct save87 *, struct savexmm *);
+static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
 #endif /* CPU_ENABLE_SSE */
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
@@ -160,7 +160,7 @@ int physmem = 0;
 int cold = 1;
 
 #ifdef COMPAT_43
-static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code));
+static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
 #endif
 
 static int
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index e3dd31a..9643191 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index dc7861f..769415e 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -129,8 +129,8 @@ apic_dump(char* str)
 #define REDIRCNT_IOAPIC(A) \
 	    ((int)((io_apic_versions[(A)] & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1)
 
-static int trigger __P((int apic, int pin, u_int32_t * flags));
-static void polarity __P((int apic, int pin, u_int32_t * flags, int level));
+static int trigger(int apic, int pin, u_int32_t * flags);
+static void polarity(int apic, int pin, u_int32_t * flags, int level);
 
 #define DEFAULT_FLAGS		\
 	((u_int32_t)		\
@@ -653,8 +653,8 @@ selected_apic_ipi(u_int target, int vector, int delivery_mode)
 #endif
 
 #if defined(READY)
-int acquire_apic_timer __P((void));
-int release_apic_timer __P((void));
+int acquire_apic_timer(void);
+int release_apic_timer(void);
 
 /*
  * Acquire the APIC timer for exclusive use.
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index e3dd31a..9643191 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index 1e64c3b..f0b1cba 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -66,7 +66,7 @@ static d_ioctl_t perfmon_ioctl;
  * assure that it is the most lowest priority task which, guarantees the
  * above.
  */
-static void perfmon_init_dev __P((void *));
+static void perfmon_init_dev(void *);
 SYSINIT(cpu, SI_SUB_DRIVERS, SI_ORDER_ANY, perfmon_init_dev, NULL);
 
 #define CDEV_MAJOR 2	/* We're really a minor of mem.c */
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 59192c5..cd4a914 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -194,30 +194,30 @@ extern pt_entry_t *SMPpt;
 static pt_entry_t *PMAP1 = 0;
 static pt_entry_t *PADDR1 = 0;
 
-static PMAP_INLINE void	free_pv_entry __P((pv_entry_t pv));
-static pt_entry_t *get_ptbase __P((pmap_t pmap));
-static pv_entry_t get_pv_entry __P((void));
-static void	i386_protection_init __P((void));
-static __inline void	pmap_changebit __P((vm_page_t m, int bit, boolean_t setem));
-
-static void	pmap_remove_all __P((vm_page_t m));
-static vm_page_t pmap_enter_quick __P((pmap_t pmap, vm_offset_t va,
-				      vm_page_t m, vm_page_t mpte));
-static int pmap_remove_pte __P((pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva));
-static void pmap_remove_page __P((struct pmap *pmap, vm_offset_t va));
-static int pmap_remove_entry __P((struct pmap *pmap, vm_page_t m,
-					vm_offset_t va));
-static boolean_t pmap_testbit __P((vm_page_t m, int bit));
-static void pmap_insert_entry __P((pmap_t pmap, vm_offset_t va,
-		vm_page_t mpte, vm_page_t m));
-
-static vm_page_t pmap_allocpte __P((pmap_t pmap, vm_offset_t va));
-
-static int pmap_release_free_page __P((pmap_t pmap, vm_page_t p));
-static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex));
-static pt_entry_t *pmap_pte_quick __P((pmap_t pmap, vm_offset_t va));
-static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex));
-static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t));
+static PMAP_INLINE void	free_pv_entry(pv_entry_t pv);
+static pt_entry_t *get_ptbase(pmap_t pmap);
+static pv_entry_t get_pv_entry(void);
+static void	i386_protection_init(void);
+static __inline void	pmap_changebit(vm_page_t m, int bit, boolean_t setem);
+
+static void	pmap_remove_all(vm_page_t m);
+static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va,
+				      vm_page_t m, vm_page_t mpte);
+static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
+static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
+static int pmap_remove_entry(struct pmap *pmap, vm_page_t m,
+					vm_offset_t va);
+static boolean_t pmap_testbit(vm_page_t m, int bit);
+static void pmap_insert_entry(pmap_t pmap, vm_offset_t va,
+		vm_page_t mpte, vm_page_t m);
+
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va);
+
+static int pmap_release_free_page(pmap_t pmap, vm_page_t p);
+static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex);
+static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va);
+static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex);
+static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
 static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
 static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait);
 
@@ -3555,8 +3555,8 @@ pmap_pid_dump(int pid)
 
 #if defined(DEBUG)
 
-static void	pads __P((pmap_t pm));
-void		pmap_pvdump __P((vm_offset_t pa));
+static void	pads(pmap_t pm);
+void		pmap_pvdump(vm_offset_t pa);
 
 /* print address space of pmap*/
 static void
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 58e1a22..ba47686 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -66,12 +66,12 @@
 
 
 
-static int i386_get_ldt	__P((struct thread *, char *));
-static int i386_set_ldt	__P((struct thread *, char *));
-static int i386_get_ioperm	__P((struct thread *, char *));
-static int i386_set_ioperm	__P((struct thread *, char *));
+static int i386_get_ldt	(struct thread *, char *);
+static int i386_set_ldt	(struct thread *, char *);
+static int i386_get_ioperm	(struct thread *, char *);
+static int i386_set_ioperm	(struct thread *, char *);
 #ifdef SMP
-static void set_user_ldt_rv	__P((struct thread *));
+static void set_user_ldt_rv	(struct thread *);
 #endif
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index a454803..57d1dea 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -100,17 +100,17 @@
 
 #include <sys/sysctl.h>
 
-int (*pmath_emulate) __P((struct trapframe *));
+int (*pmath_emulate)(struct trapframe *);
 
-extern void trap __P((struct trapframe frame));
+extern void trap(struct trapframe frame);
 #ifdef I386_CPU
-extern int trapwrite __P((unsigned addr));
+extern int trapwrite(unsigned addr);
 #endif
-extern void syscall __P((struct trapframe frame));
+extern void syscall(struct trapframe frame);
 
-static int trap_pfault __P((struct trapframe *, int, vm_offset_t));
-static void trap_fatal __P((struct trapframe *, vm_offset_t));
-void dblfault_handler __P((void));
+static int trap_pfault(struct trapframe *, int, vm_offset_t);
+static void trap_fatal(struct trapframe *, vm_offset_t);
+void dblfault_handler(void);
 
 extern inthand_t IDTVEC(lcall_syscall);
 
@@ -166,7 +166,7 @@ extern char *syscallnames[];
 
 #ifdef DEVICE_POLLING
 extern u_int32_t poll_in_trap;
-extern int ether_poll __P((int count));
+extern int ether_poll(int count);
 #endif /* DEVICE_POLLING */
 
 /*
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 01e4b30..cc4c37a 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -86,9 +86,9 @@
 #include <i386/isa/isa.h>
 #endif
 
-static void	cpu_reset_real __P((void));
+static void	cpu_reset_real(void);
 #ifdef SMP
-static void	cpu_reset_proxy __P((void));
+static void	cpu_reset_proxy(void);
 static u_int	cpu_reset_proxyid;
 static volatile u_int	cpu_reset_proxy_active;
 #endif
@@ -241,7 +241,7 @@ cpu_fork(td1, p2, td2, flags)
 void
 cpu_set_fork_handler(td, func, arg)
 	struct thread *td;
-	void (*func) __P((void *));
+	void (*func)(void *);
 	void *arg;
 {
 	/*
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index e3dd31a..9643191 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*