Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove #ifdef DIAGNOSTIC around sc from the root interrupt abort methods

Browse Source 
now it's always used.
This commit is contained in:
skrll 2014-08-05 10:33:46 +00:00
parent 1e7c4c7b77
commit b69cb7b037
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/ehci.c
View File

@ -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 xfer)
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);

6
sys/dev/usb/ohci.c
View File

@ -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 xfer)
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);

6
sys/dev/usb/xhci.c
View File

@ -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 xfer)
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);

7
sys/external/bsd/dwc2/dwc2.c vendored
View File

@ -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 xfer)
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));