Patchwork [U-Boot,05/39] GCC4.6: Squash warning in usb_storage.c

login
register
mail settings
Submitter Marek Vasut
Date Oct. 22, 2011, 12:17 a.m.
Message ID <1319242654-15534-6-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/121097/
State Superseded
Headers show

Comments

Marek Vasut - Oct. 22, 2011, 12:17 a.m.
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(-)
Mike Frysinger - Oct. 23, 2011, 5:39 a.m.
On Fri, Oct 21, 2011 at 20:17, Marek Vasut wrote:
>  #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<space>USB_BLK_DEBUG.....
-mike

Patch

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 16667f3..eb9a30e 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