[src/trunk]: src/sys Remove #ifdef DIAGNOSTIC around sc from the root interru...

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

details:   https://anonhg.NetBSD.org/src/rev/08d0f5ebe797
branches:  trunk
changeset: 797960:08d0f5ebe797
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Aug 05 10:33:46 2014 +0000

description:
Remove #ifdef DIAGNOSTIC around sc from the root interrupt abort methods
now it's always used.

diffstat:

 sys/dev/usb/ehci.c           |  6 ++----
 sys/dev/usb/ohci.c           |  6 ++----
 sys/dev/usb/xhci.c           |  6 ++----
 sys/external/bsd/dwc2/dwc2.c |  7 +++----
 4 files changed, 9 insertions(+), 16 deletions(-)

diffs (113 lines):

diff -r ee47eea15051 -r 08d0f5ebe797 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Tue Aug 05 08:52:10 2014 +0000
+++ b/sys/dev/usb/ehci.c        Tue Aug 05 10:33:46 2014 +0000
@@ -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 @@
 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);
diff -r ee47eea15051 -r 08d0f5ebe797 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Tue Aug 05 08:52:10 2014 +0000
+++ b/sys/dev/usb/ohci.c        Tue Aug 05 10:33:46 2014 +0000
@@ -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 @@
 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);
diff -r ee47eea15051 -r 08d0f5ebe797 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Tue Aug 05 08:52:10 2014 +0000
+++ b/sys/dev/usb/xhci.c        Tue Aug 05 10:33:46 2014 +0000
@@ -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 @@
 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);
diff -r ee47eea15051 -r 08d0f5ebe797 sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Tue Aug 05 08:52:10 2014 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Tue Aug 05 10:33:46 2014 +0000
@@ -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 @@
 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));