Remove __P.

Reveiwed by: benno

19 files changed, 132 insertions, 136 deletions

diff --git a/sys/powerpc/aim/clock.c b/sys/powerpc/aim/clock.c
index e8ba90f..f2dccd6 100644
--- a/sys/powerpc/aim/clock.c
+++ b/sys/powerpc/aim/clock.c
@@ -92,8 +92,8 @@ static volatile u_long	lasttb;
 #define	DIFF19041970	2082844800
 
 #if NADB > 0
-extern int adb_read_date_time __P((int *));
-extern int adb_set_date_time __P((int));
+extern int adb_read_date_time(int *);
+extern int adb_set_date_time(int);
 #endif
 
 static int		clockinitted = 0;
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 6c122e6..a21fa1a 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -79,12 +79,12 @@ extern char *syscallnames[];
 #endif
 
 #if 0 /* XXX: not used yet */
-static int fix_unaligned __P((struct proc *p, struct trapframe *frame));
+static int fix_unaligned(struct proc *p, struct trapframe *frame);
 #endif
-static void trap_fatal __P((struct trapframe *frame));
-static void printtrap __P((int vector, struct trapframe *frame, int isfatal,
-			      int user));
-static int trap_pfault __P((struct trapframe *frame, int user));
+static void trap_fatal(struct trapframe *frame);
+static void printtrap(int vector, struct trapframe *frame, int isfatal,
+			      int user);
+static int trap_pfault(struct trapframe *frame, int user);
 static int handle_onfault (struct trapframe *frame);
 
 static const char *ppc_exception_names[] = {
@@ -139,7 +139,7 @@ static const char *ppc_exception_names[] = {
 };
 
 static void
-printtrap __P((int vector, struct trapframe *frame, int isfatal, int user))
+printtrap(int vector, struct trapframe *frame, int isfatal, int user)
 {
 
 	printf("\n");
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 966afdc..6a152c9 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -177,7 +177,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 void
 cpu_set_fork_handler(td, func, arg)
 	struct thread *td;
-	void (*func) __P((void *));
+	void (*func)(void *);
 	void *arg;
 {
 	struct	callframe *cf;
diff --git a/sys/powerpc/include/bootinfo.h b/sys/powerpc/include/bootinfo.h
index ffcd4bb..c1ff9d5 100644
--- a/sys/powerpc/include/bootinfo.h
+++ b/sys/powerpc/include/bootinfo.h
@@ -51,9 +51,9 @@ struct bootinfo_v1 {
 	char	booted_kernel[64];	/* 80: name of booted kernel	*/
 	void	*hwrpb;			/* 144: hwrpb pointer (BEVA)	*/
 	u_long	hwrpbsize;		/* 152: size of hwrpb data	*/
-	int	(*cngetc) __P((void));	/* 160: console getc pointer	*/
-	void	(*cnputc) __P((int));	/* 168: console putc pointer	*/
-	void	(*cnpollc) __P((int));	/* 176: console pollc pointer	*/
+	int	(*cngetc)(void);	/* 160: console getc pointer	*/
+	void	(*cnputc)(int);	/* 168: console putc pointer	*/
+	void	(*cnpollc)(int);	/* 176: console pollc pointer	*/
 	u_long	pad[6];			/* 184: rsvd for future use	*/
 	char	*envp;			/* 232:	start of environment	*/
 	u_long	kernend;		/* 240: end of kernel		*/
diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index a906e35..2428f4b 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -100,7 +100,7 @@ typedef u_int32_t bus_space_tag_t;
 typedef u_int32_t bus_space_handle_t;
 
 /*
- *	int bus_space_map  __P((bus_space_tag_t t, bus_addr_t addr,
+ *	int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
  *	    bus_size_t size, int flags, bus_space_handle_t *bshp));
  *
  * Map a region of bus space.
@@ -125,7 +125,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 }
 
 /*
- *	int bus_space_unmap __P((bus_space_tag_t t,
+ *	int bus_space_unmap(bus_space_tag_t t,
  *	    bus_space_handle_t bsh, bus_size_t size));
  *
  * Unmap a region of bus space.
@@ -134,7 +134,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 #define bus_space_unmap(t, bsh, size)
 
 /*
- *	int bus_space_subregion __P((bus_space_tag_t t,
+ *	int bus_space_subregion(bus_space_tag_t t,
  *	    bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
  *	    bus_space_handle_t *nbshp));
  *
@@ -145,7 +145,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 	((*(bshp) = (bus_space_handle_t)__BA(t, bsh, offset)), 0)
 
 /*
- *	int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
+ *	int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
  *	    bus_addr_t rend, bus_size_t size, bus_size_t align,
  *	    bus_size_t boundary, int flags, bus_addr_t *addrp,
  *	    bus_space_handle_t *bshp));
@@ -158,7 +158,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 #endif
 
 /*
- *	int bus_space_free __P((bus_space_tag_t t,
+ *	int bus_space_free(bus_space_tag_t t,
  *	    bus_space_handle_t bsh, bus_size_t size));
  *
  * Free a region of bus space.
@@ -168,7 +168,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 #endif
 
 /*
- *	u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
+ *	u_intN_t bus_space_read_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset));
  *
  * Read a 1, 2, 4, or 8 byte quantity from bus space
@@ -190,7 +190,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 #endif
 
 /*
- *	void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    u_intN_t *addr, size_t count));
  *
@@ -231,7 +231,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 #endif
 
 /*
- *	void bus_space_read_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    u_intN_t *addr, size_t count));
  *
@@ -306,7 +306,7 @@ bus_space_read_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    u_intN_t value));
  *
@@ -327,7 +327,7 @@ bus_space_read_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    const u_intN_t *addr, size_t count));
  *
@@ -364,7 +364,7 @@ bus_space_read_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    const u_intN_t *addr, size_t count));
  *
@@ -438,7 +438,7 @@ bus_space_write_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
  *	    size_t count));
  *
@@ -512,7 +512,7 @@ bus_space_set_multi_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_set_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
  *	    size_t count));
  *
@@ -586,7 +586,7 @@ bus_space_set_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_copy_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_copy_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh1, bus_size_t off1,
  *	    bus_space_handle_t bsh2, bus_size_t off2,
  *	    size_t count));
@@ -600,7 +600,7 @@ bus_space_set_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
 /*
  * Bus read/write barrier methods.
  *
- *	void bus_space_barrier __P((bus_space_tag_t tag,
+ *	void bus_space_barrier(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
  *	    bus_size_t len, int flags));
  *
@@ -679,33 +679,32 @@ struct macppc_bus_dma_tag {
 	/*
 	 * DMA mapping methods.
 	 */
-	int	(*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
-		    bus_size_t, bus_size_t, int, bus_dmamap_t *));
-	void	(*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
-	int	(*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
-		    bus_size_t, struct proc *, int));
-	int	(*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct mbuf *, int));
-	int	(*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct uio *, int));
-	int	(*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_dma_segment_t *, int, bus_size_t, int));
-	void	(*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
-	void	(*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_addr_t, bus_size_t, int));
+	int	(*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+		    bus_size_t, bus_size_t, int, bus_dmamap_t *);
+	void	(*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+	int	(*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+		    bus_size_t, struct proc *, int);
+	int	(*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+		    struct mbuf *, int);
+	int	(*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+		    struct uio *, int);
+	int	(*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+		    bus_dma_segment_t *, int, bus_size_t, int);
+	void	(*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+	void	(*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+		    bus_addr_t, bus_size_t, int);
 
 	/*
 	 * DMA memory utility functions.
 	 */
-	int	(*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
-		    bus_size_t, bus_dma_segment_t *, int, int *, int));
-	void	(*_dmamem_free) __P((bus_dma_tag_t,
-		    bus_dma_segment_t *, int));
-	int	(*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, size_t, caddr_t *, int));
-	void	(*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t));
-	vm_offset_t	(*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, off_t, int, int));
+	int	(*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+		    bus_size_t, bus_dma_segment_t *, int, int *, int);
+	void	(*_dmamem_free)(bus_dma_tag_t, bus_dma_segment_t *, int);
+	int	(*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+		    int, size_t, caddr_t *, int);
+	void	(*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t);
+	vm_offset_t	(*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+		    int, off_t, int, int);
 };
 
 #define	bus_dmamap_create(t, s, n, m, b, f, p)			\
@@ -764,38 +763,35 @@ struct macppc_bus_dmamap {
 };
 
 #ifdef _MACPPC_BUS_DMA_PRIVATE
-int	_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
-	    bus_size_t, int, bus_dmamap_t *));
-void	_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int	_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
-int	_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
-int	_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
-int	_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
-void	_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void	_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-	    bus_size_t, int));
-
-int	_bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int	_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+	    bus_size_t, int, bus_dmamap_t *);
+void	_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int	_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
+int	_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, struct mbuf *, int);
+int	_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, struct uio *, int);
+int	_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
+void	_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void	_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+	    bus_size_t, int);
+
+int	_bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
-	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void	_bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs));
-int	_bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, size_t size, caddr_t *kvap, int flags));
-void	_bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
-	    size_t size));
-vm_offset_t	_bus_dmamem_mmap __P((bus_dma_tag_t tag,
+	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void	_bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs);
+int	_bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs, size_t size, caddr_t *kvap, int flags);
+void	_bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
+	    size_t size);
+vm_offset_t	_bus_dmamem_mmap(bus_dma_tag_t tag,
 	    bus_dma_segment_t *segs,
-	    int nsegs, off_t off, int prot, int flags));
+	    int nsegs, off_t off, int prot, int flags);
 
-int	_bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
-	    vm_offset_t low, vm_offset_t high));
+	    vm_offset_t low, vm_offset_t high);
 
 #endif /* _MACPPC_BUS_DMA_PRIVATE */
 
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h
index a7e6263..a3bb564 100644
--- a/sys/powerpc/include/clock.h
+++ b/sys/powerpc/include/clock.h
@@ -15,9 +15,9 @@ extern	int	disable_rtc_set;
 extern	int	wall_cmos_clock;
 extern	int	adjkerntz;
 
-int	sysbeep __P((int pitch, int period));
-int	acquire_timer2 __P((int mode));
-int	release_timer2 __P((void));
+int	sysbeep(int pitch, int period);
+int	acquire_timer2(int mode);
+int	release_timer2(void);
 
 void	decr_intr(struct clockframe *);
 
diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 71489db..0bb49b7 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -59,7 +59,7 @@ extern char bootpath[];
 #define	CACHELINESIZE	32
 #endif
 
-extern void __syncicache __P((void *, int));
+extern void __syncicache(void *, int);
 
 /*
  * CTL_MACHDEP definitions.
@@ -91,7 +91,7 @@ get_cyclecount(void)
 
 #define	cpu_getstack(td)	((td)->td_frame->fixreg[1])
 
-void	savectx __P((struct pcb *));
+void	savectx(struct pcb *);
 void	fork_trampoline(void);
 
 #endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/powerpc/include/db_machdep.h b/sys/powerpc/include/db_machdep.h
index 8d14962..55c0a03 100644
--- a/sys/powerpc/include/db_machdep.h
+++ b/sys/powerpc/include/db_machdep.h
@@ -91,8 +91,8 @@ extern db_regs_t	ddb_regs;	/* register state */
 
 #ifdef _KERNEL
 
-void	kdb_kintr __P((void *));
-int	kdb_trap __P((int, void *));
+void	kdb_kintr(void *);
+int	kdb_trap(int, void *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/powerpc/include/intr.h b/sys/powerpc/include/intr.h
index a723bd4..8bc417c 100644
--- a/sys/powerpc/include/intr.h
+++ b/sys/powerpc/include/intr.h
@@ -69,7 +69,7 @@
  * the list.  The handler is called with its (single) argument.
  */
 struct intrhand {
-	int	(*ih_fun) __P((void *));
+	int	(*ih_fun)(void *);
 	void	*ih_arg;
 	u_long	ih_count;
 	struct	intrhand *ih_next;
@@ -78,14 +78,14 @@ struct intrhand {
 };
 #endif
 
-void	setsoftclock __P((void));
-void	clearsoftclock __P((void));
-void	setsoftnet   __P((void));
-void	clearsoftnet __P((void));
+void	setsoftclock(void);
+void	clearsoftclock(void);
+void	setsoftnet(void);
+void	clearsoftnet(void);
 
-void	do_pending_int __P((void));
+void	do_pending_int(void);
 
-static __inline void softintr __P((int));
+static __inline void softintr(int);
 
 extern u_int cpl, ipending, tickspending;
 extern int imask[];
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index 75640e4..b4d0ba0 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -48,10 +48,10 @@ struct reg;
 struct cam_sim;
 struct pcicfg;
 
-void	busdma_swi __P((void));
-void	cpu_halt __P((void));
-void	cpu_reset __P((void));
-int	is_physical_memory __P((vm_offset_t addr));
-void	swi_vm __P((void *));
+void	busdma_swi(void);
+void	cpu_halt(void);
+void	cpu_reset(void);
+int	is_physical_memory(vm_offset_t addr);
+void	swi_vm(void *);
 
 #endif /* !_MACHINE_MD_VAR_H_ */
diff --git a/sys/powerpc/include/powerpc.h b/sys/powerpc/include/powerpc.h
index ceeda2f..b0ab025 100644
--- a/sys/powerpc/include/powerpc.h
+++ b/sys/powerpc/include/powerpc.h
@@ -40,19 +40,19 @@ struct mem_region {
 	vm_size_t	size;
 };
 
-void	mem_regions __P((struct mem_region **, struct mem_region **));
+void	mem_regions(struct mem_region **, struct mem_region **);
 
 /*
  * These two functions get used solely in boot() in machdep.c.
  *
  * Not sure whether boot itself should be implementation dependent instead.	XXX
  */
-void	ppc_exit __P((void));
-void	ppc_boot __P((char *bootspec));
+void	ppc_exit(void);
+void	ppc_boot(char *bootspec);
 
-int	dk_match __P((char *name));
+int	dk_match(char *name);
 
-void	ofrootfound __P((void));
+void	ofrootfound(void);
 
 extern	int booted_partition;
 
diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h
index 38e9a07..45a0285 100644
--- a/sys/powerpc/include/pte.h
+++ b/sys/powerpc/include/pte.h
@@ -114,7 +114,7 @@ extern int ptab_cnt;
 
 #ifdef	_KERNEL
 #ifndef	LOCORE
-extern u_int dsisr __P((void));
+extern u_int dsisr(void);
 #endif	/* _KERNEL */
 #endif	/* LOCORE */
 #endif	/* _MACHINE_PTE_H_ */
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index a37bbab..9d151d3 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -26,13 +26,13 @@ struct dbreg {
 /*
  * XXX these interfaces are MI, so they should be declared in a MI place.
  */
-void	setregs __P((struct thread *, u_long, u_long, u_long));
-int	fill_regs __P((struct thread *, struct reg *));
-int	set_regs __P((struct thread *, struct reg *));
-int	fill_fpregs __P((struct thread *, struct fpreg *));
-int	set_fpregs __P((struct thread *, struct fpreg *));
-int	fill_dbregs __P((struct thread *, struct dbreg *));
-int	set_dbregs __P((struct thread *, struct dbreg *));
+void	setregs(struct thread *, u_long, u_long, u_long);
+int	fill_regs(struct thread *, struct reg *);
+int	set_regs(struct thread *, struct reg *);
+int	fill_fpregs(struct thread *, struct fpreg *);
+int	set_fpregs(struct thread *, struct fpreg *);
+int	fill_dbregs(struct thread *, struct dbreg *);
+int	set_dbregs(struct thread *, struct dbreg *);
 #endif
 
 #endif /* _POWERPC_REG_H_ */
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index 0a54fa6..3c016ef 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -58,7 +58,7 @@ static const char rcsid[] =
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_debug.h>
 
-static void	configure __P((void *));
+static void	configure(void *);
 SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
 
 dev_t	rootdev = NODEV;
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index e8ba90f..f2dccd6 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -92,8 +92,8 @@ static volatile u_long	lasttb;
 #define	DIFF19041970	2082844800
 
 #if NADB > 0
-extern int adb_read_date_time __P((int *));
-extern int adb_set_date_time __P((int));
+extern int adb_read_date_time(int *);
+extern int adb_set_date_time(int);
 #endif
 
 static int		clockinitted = 0;
diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c
index 49c303a..48e893d 100644
--- a/sys/powerpc/powerpc/extintr.c
+++ b/sys/powerpc/powerpc/extintr.c
@@ -72,22 +72,22 @@ static const char rcsid[] =
 #define	HWIRQ_MAX	(NIRQ - 4 - 1)
 #define	HWIRQ_MASK	0x0fffffff
 
-void	intr_calculatemasks __P((void));
-char	*intr_typename __P((int));
-int	fakeintr __P((void *));
-
-static __inline int	cntlzw __P((int));
-static __inline int	read_irq __P((void));
-static __inline int	mapirq __P((int));
-static void		enable_irq __P((int));
-
-static __inline u_int	openpic_read __P((int));
-static __inline void	openpic_write __P((int, u_int));
-void			openpic_enable_irq __P((int));
-void			openpic_disable_irq __P((int));
-void			openpic_set_priority __P((int, int));
-static __inline int	openpic_read_irq __P((int));
-static __inline void	openpic_eoi __P((int));
+void	intr_calculatemasks(void);
+char	*intr_typename(int);
+int	fakeintr(void *);
+
+static __inline int	cntlzw(int);
+static __inline int	read_irq(void);
+static __inline int	mapirq(int);
+static void		enable_irq(int);
+
+static __inline u_int	openpic_read(int);
+static __inline void	openpic_write(int, u_int);
+void			openpic_enable_irq(int);
+void			openpic_disable_irq(int);
+void			openpic_set_priority(int, int);
+static __inline int	openpic_read_irq(int);
+static __inline void	openpic_eoi(int);
 
 unsigned int	imen = 0xffffffff;
 u_int		cpl, ipending, tickspending;
diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c
index f5c93b3..df6c50f 100644
--- a/sys/powerpc/powerpc/syncicache.c
+++ b/sys/powerpc/powerpc/syncicache.c
@@ -51,7 +51,7 @@ static const char rcsid[] =
 #error "Must know the size of a cache line"
 #endif
 #else
-static void getcachelinesize __P((void));
+static void getcachelinesize(void);
 
 static int _cachelinesize;
 #define	CACHELINESIZE	_cachelinesize
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 6c122e6..a21fa1a 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -79,12 +79,12 @@ extern char *syscallnames[];
 #endif
 
 #if 0 /* XXX: not used yet */
-static int fix_unaligned __P((struct proc *p, struct trapframe *frame));
+static int fix_unaligned(struct proc *p, struct trapframe *frame);
 #endif
-static void trap_fatal __P((struct trapframe *frame));
-static void printtrap __P((int vector, struct trapframe *frame, int isfatal,
-			      int user));
-static int trap_pfault __P((struct trapframe *frame, int user));
+static void trap_fatal(struct trapframe *frame);
+static void printtrap(int vector, struct trapframe *frame, int isfatal,
+			      int user);
+static int trap_pfault(struct trapframe *frame, int user);
 static int handle_onfault (struct trapframe *frame);
 
 static const char *ppc_exception_names[] = {
@@ -139,7 +139,7 @@ static const char *ppc_exception_names[] = {
 };
 
 static void
-printtrap __P((int vector, struct trapframe *frame, int isfatal, int user))
+printtrap(int vector, struct trapframe *frame, int isfatal, int user)
 {
 
 	printf("\n");
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 966afdc..6a152c9 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -177,7 +177,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 void
 cpu_set_fork_handler(td, func, arg)
 	struct thread *td;
-	void (*func) __P((void *));
+	void (*func)(void *);
 	void *arg;
 {
 	struct	callframe *cf;