Module Name: src
Committed By: mrg
Date: Wed Dec 7 22:52:17 UTC 2011
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: usb.c
Log Message:
kill some #ifdef USB_DEBUG with some compiler smarts.
To generate a diff of this commit:
cvs rdiff -u -r1.125.6.2 -r1.125.6.3 src/sys/dev/usb/usb.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/usb.c
diff -u src/sys/dev/usb/usb.c:1.125.6.2 src/sys/dev/usb/usb.c:1.125.6.3
--- src/sys/dev/usb/usb.c:1.125.6.2 Tue Dec 6 02:10:01 2011
+++ src/sys/dev/usb/usb.c Wed Dec 7 22:52:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.125.6.2 2011/12/06 02:10:01 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.125.6.3 2011/12/07 22:52:17 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.2 2011/12/06 02:10:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.3 2011/12/07 22:52:17 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
@@ -83,6 +83,7 @@ int usb_noexplore = 0;
#else
#define DPRINTF(x)
#define DPRINTFN(n,x)
+#define usb_noexplore 0
#endif
struct usb_softc {
@@ -372,17 +373,10 @@ usb_event_thread(void *arg)
config_pending_decr();
while (!sc->sc_dying) {
-#ifdef USB_DEBUG
if (usb_noexplore < 2)
-#endif
- usb_discover(sc);
-#ifdef USB_DEBUG
+ usb_discover(sc);
(void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
usb_noexplore ? 0 : hz * 60);
-#else
- (void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
- hz * 60);
-#endif
DPRINTFN(2,("usb_event_thread: woke up\n"));
}
sc->sc_event_thread = NULL;
@@ -777,10 +771,8 @@ usb_discover(struct usb_softc *sc)
{
DPRINTFN(2,("usb_discover\n"));
-#ifdef USB_DEBUG
if (usb_noexplore > 1)
return;
-#endif
/*
* We need mutual exclusion while traversing the device tree,
* but this is guaranteed since this function is only called
