[src/trunk]: src/sys/dev minor adjustments, to avoid warnings on debug builds

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

details:   https://anonhg.NetBSD.org/src/rev/9dece04fdc71
branches:  trunk
changeset: 846765:9dece04fdc71
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Dec 01 12:47:10 2019 +0000

description:
minor adjustments, to avoid warnings on debug builds

diffstat:

 sys/dev/pci/if_msk.c |  10 +++++-----
 sys/dev/usb/if_atu.c |  11 ++++-------
 sys/dev/usb/uhid.c   |   8 ++++----
 sys/dev/usb/ustir.c  |   5 ++---
 4 files changed, 15 insertions(+), 19 deletions(-)

diffs (132 lines):

diff -r 733c223804c6 -r 9dece04fdc71 sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Sun Dec 01 12:19:28 2019 +0000
+++ b/sys/dev/pci/if_msk.c      Sun Dec 01 12:47:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.95 2019/11/28 17:09:10 maxv Exp $ */
+/* $NetBSD: if_msk.c,v 1.96 2019/12/01 12:47:10 maxv Exp $ */
 /*     $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $     */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.95 2019/11/28 17:09:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.96 2019/12/01 12:47:10 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -139,9 +139,9 @@
 #define DPRINTFN(n, x) if (mskdebug >= (n)) printf x
 int    mskdebug = MSK_DEBUG;
 
-void msk_dump_txdesc(struct msk_tx_desc *, int);
-void msk_dump_mbuf(struct mbuf *);
-void msk_dump_bytes(const char *, int);
+static void msk_dump_txdesc(struct msk_tx_desc *, int);
+static void msk_dump_mbuf(struct mbuf *);
+static void msk_dump_bytes(const char *, int);
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n, x)
diff -r 733c223804c6 -r 9dece04fdc71 sys/dev/usb/if_atu.c
--- a/sys/dev/usb/if_atu.c      Sun Dec 01 12:19:28 2019 +0000
+++ b/sys/dev/usb/if_atu.c      Sun Dec 01 12:47:10 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_atu.c,v 1.66 2019/11/28 17:09:10 maxv Exp $ */
+/*     $NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $ */
 /*     $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.66 2019/11/28 17:09:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -267,10 +267,6 @@
 static void    atu_xfer_list_free(struct atu_softc *, struct atu_chain *,
            int);
 
-#ifdef ATU_DEBUG
-static void    atu_debug_print(struct atu_softc *);
-#endif
-
 static void atu_task(void *);
 static int atu_newstate(struct ieee80211com *, enum ieee80211_state, int);
 static int atu_tx_start(struct atu_softc *, struct ieee80211_node *,
@@ -2053,7 +2049,8 @@
        return 0;
 }
 
-#ifdef ATU_DEBUG
+#if 0 && defined(ATU_DEBUG) /* XXX XXX XXX UNUSED */
+static void    atu_debug_print(struct atu_softc *);
 static void
 atu_debug_print(struct atu_softc *sc)
 {
diff -r 733c223804c6 -r 9dece04fdc71 sys/dev/usb/uhid.c
--- a/sys/dev/usb/uhid.c        Sun Dec 01 12:19:28 2019 +0000
+++ b/sys/dev/usb/uhid.c        Sun Dec 01 12:47:10 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhid.c,v 1.109 2019/12/01 08:27:54 maxv Exp $  */
+/*     $NetBSD: uhid.c,v 1.110 2019/12/01 12:47:10 maxv Exp $  */
 
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.109 2019/12/01 08:27:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.110 2019/12/01 12:47:10 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -385,7 +385,7 @@
        return 0;
 }
 
-int
+Static int
 uhid_do_read(struct uhid_softc *sc, struct uio *uio, int flag)
 {
        int error = 0;
@@ -467,7 +467,7 @@
        return error;
 }
 
-static int
+Static int
 uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag)
 {
        int error;
diff -r 733c223804c6 -r 9dece04fdc71 sys/dev/usb/ustir.c
--- a/sys/dev/usb/ustir.c       Sun Dec 01 12:19:28 2019 +0000
+++ b/sys/dev/usb/ustir.c       Sun Dec 01 12:47:10 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ustir.c,v 1.43 2019/12/01 08:27:54 maxv Exp $  */
+/*     $NetBSD: ustir.c,v 1.44 2019/12/01 12:47:10 maxv Exp $  */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.43 2019/12/01 08:27:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.44 2019/12/01 12:47:10 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -146,7 +146,6 @@
 
 #define USTIR_WR_TIMEOUT 200
 
-Static int ustir_activate(device_t, enum devact);
 Static int ustir_open(void *, int, int, struct lwp *);
 Static int ustir_close(void *, int, int, struct lwp *);
 Static int ustir_read(void *, struct uio *, int);