diff mbox

[U-Boot,3/5] GCC4.6: Squash warning in usb_storage.c

Message ID 1319535558-20782-4-git-send-email-marek.vasut@gmail.com
State Accepted
Commit 86bd3ff8fd31fc1b4ef6334ea3f0c10ae2ee6c90
Headers show

Commit Message

Marek Vasut Oct. 25, 2011, 9:39 a.m. UTC
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:466:6: warning: variable ‘result’ 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>
---
 common/usb_storage.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Comments

Wolfgang Denk Oct. 27, 2011, 9:58 p.m. UTC | #1
Dear Marek Vasut,

In message <1319535558-20782-4-git-send-email-marek.vasut@gmail.com> you wrote:
> usb_storage.c: In function ‘usb_stor_CB_reset’:
> usb_storage.c:466:6: warning: variable ‘result’ 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>
> ---
>  common/usb_storage.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 16667f3..10e786f 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -56,16 +56,17 @@ 
 #include <part.h>
 #include <usb.h>
 
-#undef USB_STOR_DEBUG
 #undef BBB_COMDAT_TRACE
 #undef BBB_XPORT_TRACE
 
 #ifdef	USB_STOR_DEBUG
-#define USB_STOR_PRINTF(fmt, args...)	printf(fmt , ##args)
+#define USB_BLK_DEBUG	1
 #else
-#define USB_STOR_PRINTF(fmt, args...)
+#define USB_BLK_DEBUG	0
 #endif
 
+#define USB_STOR_PRINTF(fmt, args...)	debug_cond(USB_BLK_DEBUG, fmt, ##args)
+
 #include <scsi.h>
 /* direction table -- this indicates the direction of the data
  * transfer for each command code -- a 1 indicates input