diff --git a/common/usb.c b/common/usb.c
index 2cd50db999..bed5116505 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -56,15 +56,15 @@
 #endif
 
 #ifdef DEBUG
-#define USB_DEBUG
-#define USB_HUB_DEBUG
+#define USB_DEBUG	1
+#define USB_HUB_DEBUG	1
+#else
+#define USB_DEBUG	0
+#define USB_HUB_DEBUG	0
 #endif
 
-#ifdef	USB_DEBUG
-#define	USB_PRINTF(fmt, args...)	printf(fmt , ##args)
-#else
-#define USB_PRINTF(fmt, args...)
-#endif
+#define USB_PRINTF(fmt, args...)	debug_cond(USB_DEBUG, fmt, ##args)
+#define USB_HUB_PRINTF(fmt, args...)	debug_cond(USB_HUB_DEBUG, fmt, ##args)
 
 #define USB_BUFSIZ	512
 
@@ -968,13 +968,6 @@ void usb_scan_devices(void)
  * Probes device for being a hub and configurate it
  */
 
-#ifdef	USB_HUB_DEBUG
-#define	USB_HUB_PRINTF(fmt, args...)	printf(fmt , ##args)
-#else
-#define USB_HUB_PRINTF(fmt, args...)
-#endif
-
-
 static struct usb_hub_device hub_dev[USB_MAX_HUB];
 static int usb_hub_index;