From: Marek Vasut <marek.vasut@gmail.com>
Date: Tue, 25 Oct 2011 09:39:14 +0000 (+0200)
Subject: GCC4.6: Squash warnings in common/usb.c
X-Git-Tag: v2011.12-rc1~377
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88ec8c1246bd13a9620a97b0007ca4162fcf5197;p=oweals%2Fu-boot.git

GCC4.6: Squash warnings in common/usb.c

usb.c: In function ‘usb_parse_config’:
usb.c:331:17: warning: variable ‘ch’ set but not used
[-Wunused-but-set-variable]
usb.c: In function ‘usb_hub_port_connect_change’:
usb.c:1123:29: warning: variable ‘portchange’ set but not used
[-Wunused-but-set-variable]
usb.c: In function ‘usb_hub_configure’:
usb.c:1183:25: warning: variable ‘hubsts’ set but not used
[-Wunused-but-set-variable]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/common/usb.c b/common/usb.c
index 2cd50db999..bed5116505 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -56,16 +56,16 @@
 #endif
 
 #ifdef DEBUG
-#define USB_DEBUG
-#define USB_HUB_DEBUG
-#endif
-
-#ifdef	USB_DEBUG
-#define	USB_PRINTF(fmt, args...)	printf(fmt , ##args)
+#define USB_DEBUG	1
+#define USB_HUB_DEBUG	1
 #else
-#define USB_PRINTF(fmt, args...)
+#define USB_DEBUG	0
+#define USB_HUB_DEBUG	0
 #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
 
 static struct usb_device usb_dev[USB_MAX_DEVICE];
@@ -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;