Module Name: src
Committed By: skrll
Date: Tue Aug 5 10:33:46 UTC 2014
Modified Files:
src/sys/dev/usb: ehci.c ohci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Remove #ifdef DIAGNOSTIC around sc from the root interrupt abort methods
now it's always used.
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.30 -r1.31 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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.227 src/sys/dev/usb/ehci.c:1.228
--- src/sys/dev/usb/ehci.c:1.227 Tue Aug 5 06:35:24 2014
+++ src/sys/dev/usb/ehci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.228 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.228 2014/08/05 10:33:46 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2604,9 +2604,7 @@ ehci_root_intr_start(usbd_xfer_handle xf
Static void
ehci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
-#endif
KASSERT(mutex_owned(&sc->sc_lock));
KASSERT(xfer->pipe->intrxfer == xfer);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.252 src/sys/dev/usb/ohci.c:1.253
--- src/sys/dev/usb/ohci.c:1.252 Tue Aug 5 08:33:50 2014
+++ src/sys/dev/usb/ohci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2865,9 +2865,7 @@ ohci_root_intr_start(usbd_xfer_handle xf
Static void
ohci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
-#endif
KASSERT(mutex_owned(&sc->sc_lock));
KASSERT(xfer->pipe->intrxfer == xfer);
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.22 src/sys/dev/usb/xhci.c:1.23
--- src/sys/dev/usb/xhci.c:1.22 Tue Aug 5 08:33:50 2014
+++ src/sys/dev/usb/xhci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2452,9 +2452,7 @@ xhci_root_intr_start(usbd_xfer_handle xf
static void
xhci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
struct xhci_softc * const sc = xfer->pipe->device->bus->hci_private;
-#endif
KASSERT(mutex_owned(&sc->sc_lock));
KASSERT(xfer->pipe->intrxfer == xfer);
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.30 src/sys/external/bsd/dwc2/dwc2.c:1.31
--- src/sys/external/bsd/dwc2/dwc2.c:1.30 Tue Aug 5 08:33:50 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $");
#include "opt_usb.h"
@@ -904,9 +904,8 @@ dwc2_root_intr_start(usbd_xfer_handle xf
Static void
dwc2_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
struct dwc2_softc *sc = DWC2_XFER2SC(xfer);
-#endif
+
DPRINTF("xfer=%p\n", xfer);
KASSERT(mutex_owned(&sc->sc_lock));
