Remove logprintf macro

42 files changed, 115 insertions, 117 deletions

diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 0ff1cffa6db..d4e35e008f6 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hid.c,v 1.15 2004/07/08 22:18:44 deraadt Exp $ */
+/*	$OpenBSD: hid.c,v 1.16 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: hid.c,v 1.23 2002/07/11 21:14:25 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
@@ -52,8 +52,8 @@
 #include <dev/usb/hid.h>
 
 #ifdef UHIDEV_DEBUG
-#define DPRINTF(x)	do { if (uhidevdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uhidevdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uhidevdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uhidevdebug>(n)) printf x; } while (0)
 extern int uhidevdebug;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 5da8c137141..3e09c62d676 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.53 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.54 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -133,8 +133,8 @@
 #include <dev/usb/if_auereg.h>
 
 #ifdef AUE_DEBUG
-#define DPRINTF(x)	do { if (auedebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (auedebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (auedebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (auedebug >= (n)) printf x; } while (0)
 int	auedebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index ff4de91988c..672dfce7808 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.67 2007/05/21 05:18:56 jsg Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.68 2007/05/21 05:40:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -132,8 +132,8 @@
 #include <dev/usb/if_axereg.h>
 
 #ifdef AXE_DEBUG
-#define DPRINTF(x)	do { if (axedebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (axedebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (axedebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (axedebug >= (n)) printf x; } while (0)
 int	axedebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 4b986024bde..190a9f11eb8 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.33 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.34 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -107,8 +107,8 @@
 #include <dev/usb/if_cuereg.h>
 
 #ifdef CUE_DEBUG
-#define DPRINTF(x)	do { if (cuedebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (cuedebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (cuedebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (cuedebug >= (n)) printf x; } while (0)
 int	cuedebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 3063b4b90e2..4e02638d5ee 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.45 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.46 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -119,8 +119,8 @@
 #include <dev/usb/if_kuevar.h>
 
 #ifdef KUE_DEBUG
-#define DPRINTF(x)	do { if (kuedebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (kuedebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (kuedebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (kuedebug >= (n)) printf x; } while (0)
 int	kuedebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 1b35c9a6fe0..dd023fc0078 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.89 2007/02/19 17:22:02 deraadt Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.90 2007/05/21 05:40:27 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -72,8 +72,8 @@
 #endif
 
 #ifdef URAL_DEBUG
-#define DPRINTF(x)	do { if (ural_debug) logprintf x; } while (0)
-#define DPRINTFN(n, x)	do { if (ural_debug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ural_debug) printf x; } while (0)
+#define DPRINTFN(n, x)	do { if (ural_debug >= (n)) printf x; } while (0)
 int ural_debug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 0e767561047..c20370b678a 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.54 2007/02/19 17:22:02 deraadt Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.55 2007/05/21 05:40:27 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -72,8 +72,8 @@
 #endif
 
 #ifdef RUM_DEBUG
-#define DPRINTF(x)	do { if (rum_debug) logprintf x; } while (0)
-#define DPRINTFN(n, x)	do { if (rum_debug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (rum_debug) printf x; } while (0)
+#define DPRINTFN(n, x)	do { if (rum_debug >= (n)) printf x; } while (0)
 int rum_debug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index a1f05fd8e45..4258aa11874 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.17 2007/02/19 17:22:02 deraadt Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.18 2007/05/21 05:40:27 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -81,8 +81,8 @@
 #endif
 
 #ifdef UATH_DEBUG
-#define DPRINTF(x)	do { if (uath_debug) logprintf x; } while (0)
-#define DPRINTFN(n, x)	do { if (uath_debug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uath_debug) printf x; } while (0)
+#define DPRINTFN(n, x)	do { if (uath_debug >= (n)) printf x; } while (0)
 int uath_debug = 1;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 53baadcfa4f..2b3e50cd865 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.23 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.24 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -127,8 +127,8 @@ Static int udav_mem_write1(struct udav_softc *, int, unsigned char);
 
 /* Macros */
 #ifdef UDAV_DEBUG
-#define DPRINTF(x)	do { if (udavdebug) logprintf x; } while(0)
-#define DPRINTFN(n,x)	do { if (udavdebug >= (n)) logprintf x; } while(0)
+#define DPRINTF(x)	do { if (udavdebug) printf x; } while(0)
+#define DPRINTFN(n,x)	do { if (udavdebug >= (n)) printf x; } while(0)
 int udavdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 81fb5fdd1b6..fd3be4c9f61 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.26 2007/02/11 20:29:22 miod Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.27 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -168,8 +168,8 @@ struct upl_softc {
 };
 
 #ifdef UPL_DEBUG
-#define DPRINTF(x)	do { if (upldebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (upldebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (upldebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (upldebug >= (n)) printf x; } while (0)
 int	upldebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index c9d0b36a895..c0738c08f17 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.36 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: if_url.c,v 1.37 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -133,8 +133,8 @@ Static int url_mem(struct url_softc *, int, int, void *, int);
 
 /* Macros */
 #ifdef URL_DEBUG
-#define DPRINTF(x)	do { if (urldebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (urldebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (urldebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (urldebug >= (n)) printf x; } while (0)
 int urldebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index cd833bd3d3d..b6a32f5ab86 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.34 2007/04/01 18:02:49 ray Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.35 2007/05/21 05:40:27 jsg Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -112,8 +112,8 @@ void wi_dump_data(void *buffer, int len);
 void wi_usb_thread(void *arg);
 
 #ifdef WI_USB_DEBUG
-#define DPRINTF(x)      do { if (wi_usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)   do { if (wi_usbdebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)      do { if (wi_usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)   do { if (wi_usbdebug >= (n)) printf x; } while (0)
 int     wi_usbdebug = 1;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 20daeffb8d5..51343cc4184 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.76 2007/03/22 05:53:36 pascoe Exp $ */
+/*	$OpenBSD: ohci.c,v 1.77 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -72,8 +72,8 @@ struct cfdriver ohci_cd = {
 };
 
 #ifdef OHCI_DEBUG
-#define DPRINTF(x)	do { if (ohcidebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (ohcidebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ohcidebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (ohcidebug>(n)) printf x; } while (0)
 int ohcidebug = 0;
 #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
 #else
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index bbe4f851105..c6c9d0aed69 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.1 2006/08/14 08:30:22 jsg Exp $	*/
+/*	$OpenBSD: uark.c,v 1.2 2007/05/21 05:40:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -32,7 +32,7 @@
 #include <dev/usb/ucomvar.h>
 
 #ifdef UARK_DEBUG
-#define DPRINTFN(n, x)  do { if (uarkdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)  do { if (uarkdebug > (n)) printf x; } while (0)
 int	uarkebug = 0;
 #else
 #define DPRINTFN(n, x)
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index ceb52a64de3..8d9be07fe19 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.37 2006/06/23 06:27:11 miod Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.38 2007/05/21 05:40:27 jsg Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -74,8 +74,8 @@
 /* #define UAUDIO_DEBUG */
 /* #define UAUDIO_MULTIPLE_ENDPOINTS */
 #ifdef UAUDIO_DEBUG
-#define DPRINTF(x)	do { if (uaudiodebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uaudiodebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uaudiodebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uaudiodebug>(n)) printf x; } while (0)
 int	uaudiodebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 0ff4d5a3f7e..cbc98a8160c 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.20 2007/02/27 11:02:34 fkr Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.21 2007/05/21 05:40:28 jsg Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -105,7 +105,7 @@ SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,
 	   &ubsadebug, 0, "ubsa debug level");
 #endif
 
-#define	DPRINTFN(n, x)	do { if (ubsadebug > (n)) logprintf x; } while (0)
+#define	DPRINTFN(n, x)	do { if (ubsadebug > (n)) printf x; } while (0)
 #else
 #define	DPRINTFN(n, x)
 #endif
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 8da14204f16..742ecb9fbd8 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.4 2006/08/24 12:14:23 jason Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.5 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -68,8 +68,8 @@
 #include <dev/usb/ucomvar.h>
 
 #ifdef UCYCOM_DEBUG
-#define DPRINTF(x)	if (ucycomdebug) logprintf x
-#define DPRINTFN(n, x)	if (ucycomdebug > (n)) logprintf x
+#define DPRINTF(x)	if (ucycomdebug) printf x
+#define DPRINTFN(n, x)	if (ucycomdebug > (n)) printf x
 int	ucycomdebug = 200;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 74e26f55e37..6ee684abeff 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udsbr.c,v 1.9 2006/06/23 06:27:11 miod Exp $	*/
+/*	$OpenBSD: udsbr.c,v 1.10 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $	*/
 
 /*
@@ -60,8 +60,8 @@
 #include <dev/usb/usbdevs.h>
 
 #ifdef UDSBR_DEBUG
-#define DPRINTF(x)	do { if (udsbrdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (udsbrdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (udsbrdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (udsbrdebug>(n)) printf x; } while (0)
 int	udsbrdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index 2d4548b57b8..4065be2414f 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ueagle.c,v 1.12 2006/09/16 13:31:04 damien Exp $	*/
+/*	$OpenBSD: ueagle.c,v 1.13 2007/05/21 05:40:28 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2003-2006
@@ -56,8 +56,8 @@
 #include <dev/usb/ueaglevar.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (ueagledebug > 0) logprintf x; } while (0)
-#define DPRINTFN(n, x)	do { if (ueagledebug >= (n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ueagledebug > 0) printf x; } while (0)
+#define DPRINTFN(n, x)	do { if (ueagledebug >= (n)) printf x; } while (0)
 int ueagledebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 550993081d1..11ff6f9eb01 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.36 2006/11/01 03:37:23 tedu Exp $ */
+/*	$OpenBSD: ugen.c,v 1.37 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -69,8 +69,8 @@
 #include <dev/usb/usbdevs.h>
 
 #ifdef UGEN_DEBUG
-#define DPRINTF(x)	do { if (ugendebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (ugendebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ugendebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (ugendebug>(n)) printf x; } while (0)
 int	ugendebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 73d6c167b08..b6ca1c84696 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.30 2006/11/01 03:37:24 tedu Exp $ */
+/*	$OpenBSD: uhid.c,v 1.31 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -69,8 +69,8 @@
 #include <dev/usb/uhidev.h>
 
 #ifdef UHID_DEBUG
-#define DPRINTF(x)	do { if (uhiddebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uhiddebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uhiddebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uhiddebug>(n)) printf x; } while (0)
 int	uhiddebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index d96b1e90e63..8e809827891 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.19 2006/11/26 15:01:01 deraadt Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.20 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -66,8 +66,8 @@
 #include <dev/usb/ugraphire_rdesc.h>
 
 #ifdef UHIDEV_DEBUG
-#define DPRINTF(x)	do { if (uhidevdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uhidevdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uhidevdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uhidevdebug>(n)) printf x; } while (0)
 int	uhidevdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 31f0990b9ab..6f86f8fa028 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.37 2007/03/22 05:45:57 pascoe Exp $ */
+/*	$OpenBSD: uhub.c,v 1.38 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 
@@ -66,8 +66,8 @@
 #define UHUB_INTR_INTERVAL 255	/* ms */
 
 #ifdef UHUB_DEBUG
-#define DPRINTF(x)	do { if (uhubdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uhubdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uhubdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uhubdebug>(n)) printf x; } while (0)
 int	uhubdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index eab33ccd34a..ce3085c2102 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.27 2007/02/11 20:29:22 miod Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.28 2007/05/21 05:40:28 jsg Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -76,8 +76,8 @@
 #include <dev/wscons/wsksymvar.h>
 
 #ifdef UKBD_DEBUG
-#define DPRINTF(x)	do { if (ukbddebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (ukbddebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ukbddebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (ukbddebug>(n)) printf x; } while (0)
 int	ukbddebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 1cde8217c7e..2f0e24854d1 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.21 2006/06/23 06:27:11 miod Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.22 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -74,8 +74,8 @@
 #define	ULPT_BSIZE	16384
 
 #ifdef ULPT_DEBUG
-#define DPRINTF(x)	do { if (ulptdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (ulptdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (ulptdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (ulptdebug>(n)) printf x; } while (0)
 int	ulptdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index 217c384d1d1..bc271e1e313 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umassvar.h,v 1.8 2005/04/01 06:41:13 pascoe Exp $ */
+/*	$OpenBSD: umassvar.h,v 1.9 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: umassvar.h,v 1.20 2003/09/08 19:31:01 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -31,7 +31,7 @@
 
 #ifdef UMASS_DEBUG
 #define DIF(m, x)	if (umassdebug & (m)) do { x ; } while (0)
-#define DPRINTF(m, x)	do { if (umassdebug & (m)) logprintf x; } while (0)
+#define DPRINTF(m, x)	do { if (umassdebug & (m)) printf x; } while (0)
 #define UDMASS_UPPER	0x00008000	/* upper layer */
 #define UDMASS_GEN	0x00010000	/* general */
 #define UDMASS_SCSI	0x00020000	/* scsi */
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 9ce1d904b9e..76dd051052c 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.17 2006/06/23 06:27:12 miod Exp $	*/
+/*	$OpenBSD: umct.c,v 1.18 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 #include <dev/usb/umct.h>
 
 #ifdef UMCT_DEBUG
-#define DPRINTFN(n, x)  do { if (umctdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)  do { if (umctdebug > (n)) printf x; } while (0)
 int	umctdebug = 0;
 #else
 #define DPRINTFN(n, x)
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index c4124fa1366..8b5f74953ec 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.23 2007/03/12 05:43:34 deraadt Exp $ */
+/*	$OpenBSD: umodem.c,v 1.24 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -76,7 +76,7 @@
 #include <dev/usb/ucomvar.h>
 
 #ifdef UMODEM_DEBUG
-#define DPRINTFN(n, x)	do { if (umodemdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)	do { if (umodemdebug > (n)) printf x; } while (0)
 int	umodemdebug = 0;
 #else
 #define DPRINTFN(n, x)
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 6aa9525250f..9457f52381f 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ums.c,v 1.18 2007/04/10 22:37:17 miod Exp $ */
+/*	$OpenBSD: ums.c,v 1.19 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -69,8 +69,8 @@
 #include <dev/wscons/wsmousevar.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (umsdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (umsdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (umsdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (umsdebug>(n)) printf x; } while (0)
 int	umsdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 98389f29c5e..f6b3f43f9b2 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.33 2007/04/23 15:40:38 jsg Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.34 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 #include <dev/usb/ucomvar.h>
 
 #ifdef UPLCOM_DEBUG
-#define DPRINTFN(n, x)  do { if (uplcomdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)  do { if (uplcomdebug > (n)) printf x; } while (0)
 int	uplcomdebug = 0;
 #else
 #define DPRINTFN(n, x)
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 38c92880962..7f02ff90d87 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.21 2006/06/23 06:27:12 miod Exp $	*/
+/*	$OpenBSD: urio.c,v 1.22 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -73,8 +73,8 @@
 #include <dev/usb/urio.h>
 
 #ifdef URIO_DEBUG
-#define DPRINTF(x)	do { if (uriodebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uriodebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uriodebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uriodebug>(n)) printf x; } while (0)
 int	uriodebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 3c18886ff01..f5fda4ad634 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.38 2007/03/22 05:45:57 pascoe Exp $	*/
+/*	$OpenBSD: usb.c,v 1.39 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -73,8 +73,8 @@
 #include <dev/usb/usb_quirks.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usbdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usbdebug>(n)) printf x; } while (0)
 int	usbdebug = 0;
 #if defined(UHCI_DEBUG) && NUHCI > 0
 extern int	uhcidebug;
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 67e72461c88..f723c526bb7 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_mem.c,v 1.16 2004/07/08 22:18:44 deraadt Exp $ */
+/*	$OpenBSD: usb_mem.c,v 1.17 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $	*/
 
 /*
@@ -63,8 +63,8 @@
 #include <dev/usb/usb_mem.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usbdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usbdebug>(n)) printf x; } while (0)
 extern int usbdebug;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index fe2745831e6..b220cea9890 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_port.h,v 1.65 2007/05/21 05:18:56 jsg Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.66 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -121,8 +121,6 @@ typedef int usb_malloc_type;
 #define if_deactivate(x)
 #define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
 
-#define logprintf printf
-
 #define swap_bytes_change_sign16_le swap_bytes_change_sign16
 #define change_sign16_swap_bytes_le change_sign16_swap_bytes
 #define change_sign16_le change_sign16
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index d4b840dab0b..c5ffdfc1bfc 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_quirks.c,v 1.26 2007/01/01 22:27:00 deraadt Exp $ */
+/*	$OpenBSD: usb_quirks.c,v 1.27 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
@@ -154,7 +154,7 @@ usbd_find_quirk(usb_device_descriptor_t *d)
 	}
 #ifdef USB_DEBUG
 	if (usbdebug && t->quirks.uq_flags)
-		logprintf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
+		printf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
 			  UGETW(d->idVendor), UGETW(d->idProduct),
 			  UGETW(d->bcdDevice), t->quirks.uq_flags);
 #endif
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 2cca9fd6015..12601a6a169 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.48 2007/02/28 22:30:55 deraadt Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.49 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -58,8 +58,8 @@
 #include <dev/usb/usb_quirks.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usbdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usbdebug>(n)) printf x; } while (0)
 extern int usbdebug;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index fd4c1aa3f16..696832bd162 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdi.c,v 1.28 2007/03/31 19:46:44 bluhm Exp $ */
+/*	$OpenBSD: usbdi.c,v 1.29 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $	*/
 
@@ -69,8 +69,8 @@
 #endif
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usbdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usbdebug>(n)) printf x; } while (0)
 extern int usbdebug;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 58fe86f4f9c..00985a6fe7f 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdi_util.c,v 1.17 2004/07/21 00:01:08 dlg Exp $ */
+/*	$OpenBSD: usbdi_util.c,v 1.18 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $	*/
 
@@ -57,8 +57,8 @@
 #include <dev/usb/usbdi_util.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (usbdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usbdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usbdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usbdebug>(n)) printf x; } while (0)
 extern int usbdebug;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index e253c3265e5..6de5fa2e70a 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.22 2006/11/01 03:37:24 tedu Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.23 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -68,8 +68,8 @@
 #include <dev/usb/usbdevs.h>
 
 #ifdef USCANNER_DEBUG
-#define DPRINTF(x)	do { if (uscannerdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (uscannerdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (uscannerdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (uscannerdebug>(n)) printf x; } while (0)
 int	uscannerdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 43df0892ead..fd00419139a 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.4 2007/02/17 01:47:47 jsg Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.5 2007/05/21 05:40:28 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -32,7 +32,7 @@
 #include <dev/usb/ucomvar.h>
 
 #ifdef USLCOM_DEBUG
-#define DPRINTFN(n, x)  do { if (uslcomdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)  do { if (uslcomdebug > (n)) printf x; } while (0)
 int	uslcomdebug = 0;
 #else
 #define DPRINTFN(n, x)
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index e588d4b2ed3..1a39a85f755 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.12 2006/11/28 23:59:45 dlg Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.13 2007/05/21 05:40:28 jsg Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -81,8 +81,8 @@
 #endif
 
 #ifdef USSCANNER_DEBUG
-#define DPRINTF(x)	do { if (usscannerdebug) logprintf x; } while (0)
-#define DPRINTFN(n,x)	do { if (usscannerdebug>(n)) logprintf x; } while (0)
+#define DPRINTF(x)	do { if (usscannerdebug) printf x; } while (0)
+#define DPRINTFN(n,x)	do { if (usscannerdebug>(n)) printf x; } while (0)
 int	usscannerdebug = 0;
 #else
 #define DPRINTF(x)
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index bf64d61eeef..d2d5e059a0c 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.8 2006/06/23 06:27:12 miod Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.9 2007/05/21 05:40:28 jsg Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -81,7 +81,7 @@ SYSCTL_INT(_debug_usb, OID_AUTO, uvscom, CTLFLAG_RW,
 
 #endif
 
-#define DPRINTFN(n, x)  do { if (uvscomdebug > (n)) logprintf x; } while (0)
+#define DPRINTFN(n, x)  do { if (uvscomdebug > (n)) printf x; } while (0)
 #else
 #define DPRINTFN(n, x)
 #endif