From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Mon, 26 Sep 2011 19:36:19 +0200 Subject: [U-Boot] [PATCH 1/7 V3] GCC4.6: Convert various empty macros to inline functions In-Reply-To: <1316996766-14248-1-git-send-email-marek.vasut@gmail.com> References: <1316996766-14248-1-git-send-email-marek.vasut@gmail.com> Message-ID: <1317058579-936-1-git-send-email-marek.vasut@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Fix the following gcc4.6 problems: cmd_date.c: In function ?do_date?: cmd_date.c:50:6: warning: variable ?old_bus? set but not used [-Wunused-but-set-variable] asix.c: In function ?asix_init?: asix.c:317:6: warning: variable ?rx_ctl? set but not used [-Wunused-but-set-variable] 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] 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 --- common/usb.c | 4 ++-- common/usb_storage.c | 2 +- include/common.h | 4 ++-- include/i2c.h | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) V2: Squash warning in usb_storage.c V3: update diff description diff --git a/common/usb.c b/common/usb.c index a401c09..a5f9e9f 100644 --- a/common/usb.c +++ b/common/usb.c @@ -63,7 +63,7 @@ #ifdef USB_DEBUG #define USB_PRINTF(fmt, args...) printf(fmt , ##args) #else -#define USB_PRINTF(fmt, args...) +static inline void USB_PRINTF(const char *fmt, ...) {} #endif #define USB_BUFSIZ 512 @@ -970,7 +970,7 @@ void usb_scan_devices(void) #ifdef USB_HUB_DEBUG #define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args) #else -#define USB_HUB_PRINTF(fmt, args...) +static inline void USB_HUB_PRINTF(const char *fmt, ...) {} #endif diff --git a/common/usb_storage.c b/common/usb_storage.c index 16667f3..5c56918 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -63,7 +63,7 @@ #ifdef USB_STOR_DEBUG #define USB_STOR_PRINTF(fmt, args...) printf(fmt , ##args) #else -#define USB_STOR_PRINTF(fmt, args...) +static inline void USB_STOR_PRINTF(const char *fmt, ...) {} #endif #include diff --git a/include/common.h b/include/common.h index d244bd4..aeb2d84 100644 --- a/include/common.h +++ b/include/common.h @@ -120,8 +120,8 @@ typedef volatile unsigned char vu_char; #define debug(fmt,args...) printf (fmt ,##args) #define debugX(level,fmt,args...) if (DEBUG>=level) printf(fmt,##args); #else -#define debug(fmt,args...) -#define debugX(level,fmt,args...) +static inline void debug(const char *fmt, ...) {} +static inline void debugX(int level, const char *fmt, ...) {} #endif /* DEBUG */ #ifdef DEBUG diff --git a/include/i2c.h b/include/i2c.h index 8ceb4c8..323150d 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -55,7 +55,10 @@ #else #define CONFIG_SYS_MAX_I2C_BUS 1 #define I2C_GET_BUS() 0 -#define I2C_SET_BUS(a) +static inline int I2C_SET_BUS(unsigned int bus) +{ + return 0; +} #endif /* define the I2C bus number for RTC and DTT if not already done */ -- 1.7.5.4