[src/jmcneill-usbmp]: src/sys/dev/usb make these compile without DIAGNOSTIC.

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

details:   https://anonhg.NetBSD.org/src/rev/9122db75a2de
branches:  jmcneill-usbmp
changeset: 771840:9122db75a2de
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Apr 05 22:32:08 2012 +0000

description:
make these compile without DIAGNOSTIC.

diffstat:

 sys/dev/usb/ehci.c |  6 ++++--
 sys/dev/usb/ohci.c |  6 ++++--
 sys/dev/usb/uhci.c |  8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (94 lines):

diff -r 0d61e1a3273e -r 9122db75a2de sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Apr 05 21:33:11 2012 +0000
+++ b/sys/dev/usb/ehci.c        Thu Apr 05 22:32:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.181.6.19 2012/04/05 21:33:33 mrg Exp $ */
+/*     $NetBSD: ehci.c,v 1.181.6.20 2012/04/05 22:32:08 mrg 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.181.6.19 2012/04/05 21:33:33 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.20 2012/04/05 22:32:08 mrg Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -2596,7 +2596,9 @@
 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));
        if (xfer->pipe->intrxfer == xfer) {
diff -r 0d61e1a3273e -r 9122db75a2de sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Thu Apr 05 21:33:11 2012 +0000
+++ b/sys/dev/usb/ohci.c        Thu Apr 05 22:32:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.218.6.19 2012/03/11 01:52:28 mrg Exp $      */
+/*     $NetBSD: ohci.c,v 1.218.6.20 2012/04/05 22:32:08 mrg 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.218.6.19 2012/03/11 01:52:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.20 2012/04/05 22:32:08 mrg Exp $");
 
 #include "opt_usb.h"
 
@@ -2873,7 +2873,9 @@
 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));
 
diff -r 0d61e1a3273e -r 9122db75a2de sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Thu Apr 05 21:33:11 2012 +0000
+++ b/sys/dev/usb/uhci.c        Thu Apr 05 22:32:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.240.6.18 2012/03/11 01:52:28 mrg Exp $      */
+/*     $NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $      */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.18 2012/03/11 01:52:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $");
 
 #include "opt_usb.h"
 
@@ -1498,7 +1498,9 @@
 {
        usbd_xfer_handle xfer = ii->xfer;
        struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
+#ifdef DIAGNOSTIC
        uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
+#endif
        uhci_soft_td_t *std;
        u_int32_t status = 0, nstatus;
        int actlen;
@@ -2745,7 +2747,9 @@
 void
 uhci_device_isoc_abort(usbd_xfer_handle xfer)
 {
+#ifdef DIAGNOSTIC
        uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
+#endif
        struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
        uhci_soft_td_t **stds = upipe->u.iso.stds;
        uhci_soft_td_t *std;