Module Name: src
Committed By: maxv
Date: Sun Dec 1 12:47:10 UTC 2019
Modified Files:
src/sys/dev/pci: if_msk.c
src/sys/dev/usb: if_atu.c uhid.c ustir.c
Log Message:
minor adjustments, to avoid warnings on debug builds
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/ustir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.95 src/sys/dev/pci/if_msk.c:1.96
--- src/sys/dev/pci/if_msk.c:1.95 Thu Nov 28 17:09:10 2019
+++ src/sys/dev/pci/if_msk.c Sun Dec 1 12:47:10 2019
@@ -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 @@ static void msk_fill_rx_tick(void *);
#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)
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.66 src/sys/dev/usb/if_atu.c:1.67
--- src/sys/dev/usb/if_atu.c:1.66 Thu Nov 28 17:09:10 2019
+++ src/sys/dev/usb/if_atu.c Sun Dec 1 12:47:10 2019
@@ -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 int atu_rx_list_init(struct atu_s
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 @@ atu_init(struct ifnet *ifp)
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)
{
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.109 src/sys/dev/usb/uhid.c:1.110
--- src/sys/dev/usb/uhid.c:1.109 Sun Dec 1 08:27:54 2019
+++ src/sys/dev/usb/uhid.c Sun Dec 1 12:47:10 2019
@@ -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 @@ uhidclose(dev_t dev, int flag, int mode,
return 0;
}
-int
+Static int
uhid_do_read(struct uhid_softc *sc, struct uio *uio, int flag)
{
int error = 0;
@@ -467,7 +467,7 @@ uhidread(dev_t dev, struct uio *uio, int
return error;
}
-static int
+Static int
uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag)
{
int error;
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.43 src/sys/dev/usb/ustir.c:1.44
--- src/sys/dev/usb/ustir.c:1.43 Sun Dec 1 08:27:54 2019
+++ src/sys/dev/usb/ustir.c Sun Dec 1 12:47:10 2019
@@ -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 @@ struct ustir_softc {
#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);
