summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2011-09-26 19:36:19 +0200
committerWolfgang Denk <wd@denx.de>2011-10-01 23:25:18 +0200
commit60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac (patch)
treeb033ecc14601824256c74e4dc8424a3bab384030 /include
parentb30d41cad6f71b44ca3a22ff488706112cb3255b (diff)
downloadtalos-obmc-uboot-60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac.tar.gz
talos-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>
Diffstat (limited to 'include')
-rw-r--r--include/common.h4
-rw-r--r--include/i2c.h5
2 files changed, 6 insertions, 3 deletions
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 */
OpenPOWER on IntegriCloud