[src/trunk]: src/sys remove unnecessary declarations and fix KNF

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6acab716068c
branches:  trunk
changeset: 343862:6acab716068c
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Feb 29 01:29:15 2016 +0000

description:
remove unnecessary declarations and fix KNF

Thanks to riastradh@

diffstat:

 sys/netinet/ip_encap.h |  5 +----
 sys/netinet6/in6_gif.c |  6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r dceac7854a42 -r 6acab716068c sys/netinet/ip_encap.h
--- a/sys/netinet/ip_encap.h    Mon Feb 29 00:54:19 2016 +0000
+++ b/sys/netinet/ip_encap.h    Mon Feb 29 01:29:15 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.h,v 1.18 2016/02/26 07:35:17 knakahara Exp $  */
+/*     $NetBSD: ip_encap.h,v 1.19 2016/02/29 01:29:15 knakahara Exp $  */
 /*     $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $      */
 
 /*
@@ -106,9 +106,6 @@
 int    encap_detach(const struct encaptab *);
 void   *encap_getarg(struct mbuf *);
 
-void encap_lock_enter(void);
-void encap_lock_exit(void);
-
 #define        ENCAP_PR_WRAP_CTLINPUT(name)                            \
 static void *                                                  \
 name##_wrapper(int a, const struct sockaddr *b, void *c, void *d) \
diff -r dceac7854a42 -r 6acab716068c sys/netinet6/in6_gif.c
--- a/sys/netinet6/in6_gif.c    Mon Feb 29 00:54:19 2016 +0000
+++ b/sys/netinet6/in6_gif.c    Mon Feb 29 01:29:15 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $   */
+/*     $NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $   */
 /*     $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $        */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -398,7 +398,7 @@
 void *
 in6_gif_ctlinput(int cmd, const struct sockaddr *sa, void *d, void *eparg)
 {
-       struct gif_softc *sc = (struct gif_softc *)eparg;
+       struct gif_softc *sc = eparg;
        struct ip6ctlparam *ip6cp = NULL;
        struct ip6_hdr *ip6;
        const struct sockaddr_in6 *dst6;