diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-09-26 19:36:19 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-01 23:25:18 +0200 |
| commit | 60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac (patch) | |
| tree | b033ecc14601824256c74e4dc8424a3bab384030 | |
| parent | b30d41cad6f71b44ca3a22ff488706112cb3255b (diff) | |
| download | blackbird-obmc-uboot-60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac.tar.gz blackbird-obmc-uboot-60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac.zip | |
GCC4.6: Convert various empty macros to inline functions
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 <marek.vasut@gmail.com>
| -rw-r--r-- | common/usb.c | 4 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/i2c.h | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/common/usb.c b/common/usb.c index a401c09198..a5f9e9f5b0 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 16667f3948..5c56918e26 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 <scsi.h> diff --git a/include/common.h b/include/common.h index d244bd40b5..aeb2d8436b 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 8ceb4c8521..323150ded9 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 */ |
