Remove __P.

4 files changed, 41 insertions, 42 deletions

diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index d0f381c5c484..2d028fd80e8f 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -68,7 +68,7 @@ __RCSID("@(#) $FreeBSD$");
 /*
  * Local functions
  */
-static void	ipatm_closenif __P((struct ip_nif *));
+static void	ipatm_closenif(struct ip_nif *);
 
 
 /*
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 7112b3be0b7e..556e6678ab37 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -121,8 +121,8 @@ struct sp_info	ipatm_nifpool = {
 /*
  * Local functions
  */
-static int	ipatm_start __P((void));
-static int	ipatm_stop __P((void));
+static int	ipatm_start(void);
+static int	ipatm_stop(void);
 
 
 /*
@@ -619,8 +619,8 @@ done:
  *
  *******************************************************************
  */
-static int	ipatm_doload __P((void));
-static int	ipatm_dounload __P((void));
+static int	ipatm_doload(void);
+static int	ipatm_dounload(void);
 
 /*
  * Generic module load processing
@@ -779,7 +779,7 @@ ipatm_mod(lkmtp, cmd, ver)
  *
  *******************************************************************
  */
-static void	ipatm_doload __P((void *));
+static void	ipatm_doload(void *);
 
 SYSINIT(atmipatm, SI_SUB_PROTO_END, SI_ORDER_ANY, ipatm_doload, NULL)
 
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index a807b0672357..f12562de7ea5 100644
--- a/sys/netatm/ipatm/ipatm_serv.h
+++ b/sys/netatm/ipatm/ipatm_serv.h
@@ -53,27 +53,27 @@ struct ip_vccparm {
 struct ip_serv {
 /* Interfaces to IP/ATM interface services */
 	int		(*is_ifact)		/* Interface activation */
-				__P((struct ip_nif *));
+				(struct ip_nif *);
 	int		(*is_ifdact)		/* Interface deactivation */
-				__P((struct ip_nif *));
+				(struct ip_nif *);
 	int		(*is_ioctl)		/* Interface ioctl */
-				__P((int, caddr_t, caddr_t));
+				(int, caddr_t, caddr_t);
 
 /* Interfaces to IP/ATM ARP services */
 	int		(*is_arp_pvcopen)	/* IP creating dynamic PVC */
-				__P((struct ipvcc *));
+				(struct ipvcc *);
 	int		(*is_arp_svcout)	/* IP creating outgoing SVC */
-				__P((struct ipvcc *, struct in_addr *));
+				(struct ipvcc *, struct in_addr *);
 	int		(*is_arp_svcin)		/* IP creating incoming SVC */
-				__P((struct ipvcc *, Atm_addr *, Atm_addr *));
+				(struct ipvcc *, Atm_addr *, Atm_addr *);
 	int		(*is_arp_svcact)	/* IP SVC is active */
-				__P((struct ipvcc *));
+				(struct ipvcc *);
 	void		(*is_arp_close)		/* IP closing VCC */
-				__P((struct ipvcc *));
+				(struct ipvcc *);
 
 /* Interfaces to IP/ATM broadcast services */
 	int		(*is_bcast_output)	/* IP broadcast packet output */
-				__P((struct ip_nif *, KBuffer *));
+				(struct ip_nif *, KBuffer *);
 
 /* Interfaces to IP/ATM multicast services */
 
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index fc5be44beba2..6e7e11b3ae30 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -101,12 +101,12 @@ struct ip_nif {
 
 /* IP/ATM provided interface services */
 	void		(*inf_arpnotify)/* ARP event notification */
-				__P((struct ipvcc *, int));
+				(struct ipvcc *, int);
 	int		(*inf_ipinput)	/* IP packet input */
-				__P((struct ip_nif *, KBuffer *));
+				(struct ip_nif *, KBuffer *);
 	int		(*inf_createsvc)/* Create an IP SVC */
-				__P((struct ifnet *, u_short, caddr_t,
-				     struct ipvcc **));
+				(struct ifnet *, u_short, caddr_t,
+				     struct ipvcc **);
 };
 
 /*
@@ -155,41 +155,40 @@ struct ipatmpvc {
  * Global function declarations
  */
 	/* ipatm_event.c */
-void		ipatm_timeout __P((struct atm_time *));
-void		ipatm_connected __P((void *));
-void		ipatm_cleared __P((void *, struct t_atm_cause *));
-void		ipatm_arpnotify __P((struct ipvcc *, int));
-void		ipatm_itimeout __P((struct atm_time *));
+void		ipatm_timeout(struct atm_time *);
+void		ipatm_connected(void *);
+void		ipatm_cleared(void *, struct t_atm_cause *);
+void		ipatm_arpnotify(struct ipvcc *, int);
+void		ipatm_itimeout(struct atm_time *);
 
 	/* ipatm_if.c */
-int		ipatm_nifstat __P((int, struct atm_nif *, int));
+int		ipatm_nifstat(int, struct atm_nif *, int);
 
 	/* ipatm_input.c */
-void		ipatm_cpcs_data __P((void *, KBuffer *));
-int		ipatm_ipinput __P((struct ip_nif *, KBuffer *));
+void		ipatm_cpcs_data(void *, KBuffer *);
+int		ipatm_ipinput(struct ip_nif *, KBuffer *);
 
 	/* ipatm_load.c */
 
 	/* ipatm_output.c */
-int		ipatm_ifoutput __P((struct ifnet *, KBuffer *,
-			struct sockaddr *));
+int		ipatm_ifoutput(struct ifnet *, KBuffer *, struct sockaddr *);
 
 	/* ipatm_usrreq.c */
-int		ipatm_ioctl __P((int, caddr_t, caddr_t));
-caddr_t		ipatm_getname __P((void *));
+int		ipatm_ioctl(int, caddr_t, caddr_t);
+caddr_t		ipatm_getname(void *);
 
 	/* ipatm_vcm.c */
-int		ipatm_openpvc __P((struct ipatmpvc *, struct ipvcc **));
-int		ipatm_createsvc __P((struct ifnet *, u_short, caddr_t,
-			struct ipvcc **));
-int		ipatm_opensvc __P((struct ipvcc *));
-int		ipatm_retrysvc __P((struct ipvcc *));
-void		ipatm_activate __P((struct ipvcc *));
-int		ipatm_incoming __P((void *, Atm_connection *, Atm_attributes *,
-			void **));
-int		ipatm_closevc __P((struct ipvcc *, int));
-int		ipatm_chknif __P((struct in_addr, struct ip_nif *));
-struct ipvcc	*ipatm_iptovc __P((struct sockaddr_in *, struct atm_nif *));
+int		ipatm_openpvc(struct ipatmpvc *, struct ipvcc **);
+int		ipatm_createsvc(struct ifnet *, u_short, caddr_t,
+			struct ipvcc **);
+int		ipatm_opensvc(struct ipvcc *);
+int		ipatm_retrysvc(struct ipvcc *);
+void		ipatm_activate(struct ipvcc *);
+int		ipatm_incoming(void *, Atm_connection *, Atm_attributes *,
+			void **);
+int		ipatm_closevc(struct ipvcc *, int);
+int		ipatm_chknif(struct in_addr, struct ip_nif *);
+struct ipvcc	*ipatm_iptovc(struct sockaddr_in *, struct atm_nif *);
  
 
 /*