Module Name: src
Committed By: riastradh
Date: Sat Feb 15 13:56:56 UTC 2020
Modified Files:
src/sys/dev/usb: motg.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Fix non-DIAGNOSTIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.69 -r1.70 src/sys/external/bsd/dwc2/dwc2.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/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.28 src/sys/dev/usb/motg.c:1.29
--- src/sys/dev/usb/motg.c:1.28 Sat Feb 15 07:46:48 2020
+++ src/sys/dev/usb/motg.c Sat Feb 15 13:56:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.28 2020/02/15 07:46:48 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.28 2020/02/15 07:46:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1056,7 +1056,7 @@ motg_root_intr_start(struct usbd_xfer *x
void
motg_root_intr_close(struct usbd_pipe *pipe)
{
- struct motg_softc *sc = MOTG_PIPE2SC(pipe);
+ struct motg_softc *sc __diagused = MOTG_PIPE2SC(pipe);
MOTGHIST_FUNC(); MOTGHIST_CALLED();
KASSERT(mutex_owned(&sc->sc_lock));
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.69 src/sys/external/bsd/dwc2/dwc2.c:1.70
--- src/sys/external/bsd/dwc2/dwc2.c:1.69 Sat Feb 15 01:21:56 2020
+++ src/sys/external/bsd/dwc2/dwc2.c Sat Feb 15 13:56:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.69 2020/02/15 01:21:56 riastradh Exp $ */
+/* $NetBSD: dwc2.c,v 1.70 2020/02/15 13:56:56 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.69 2020/02/15 01:21:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.70 2020/02/15 13:56:56 riastradh Exp $");
#include "opt_usb.h"
@@ -683,7 +683,7 @@ dwc2_root_intr_abort(struct usbd_xfer *x
Static void
dwc2_root_intr_close(struct usbd_pipe *pipe)
{
- struct dwc2_softc *sc = DWC2_PIPE2SC(pipe);
+ struct dwc2_softc *sc __diagused = DWC2_PIPE2SC(pipe);
DPRINTF("\n");
