GCC4.6: Squash warning in cmd_date.c
authorMarek Vasut <marek.vasut@gmail.com>
Tue, 25 Oct 2011 09:40:57 +0000 (11:40 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 27 Oct 2011 21:54:08 +0000 (23:54 +0200)
cmd_date.c: In function ‘do_date’:
cmd_date.c:50:6: warning: variable ‘old_bus’ 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>
include/i2c.h

index 8ceb4c852149425c91377dc2a8d56e2bfd7c6c5a..ee31034c7aa2236a919d2171fe127fd0bac92097 100644 (file)
  */
 #define I2C_RXTX_LEN   128     /* maximum tx/rx buffer length */
 
-#if defined(CONFIG_I2C_MULTI_BUS)
-#if !defined(CONFIG_SYS_MAX_I2C_BUS)
-#define CONFIG_SYS_MAX_I2C_BUS         2
-#endif
-#define I2C_GET_BUS()          i2c_get_bus_num()
-#define I2C_SET_BUS(a)         i2c_set_bus_num(a)
+#ifdef CONFIG_I2C_MULTI_BUS
+#define        MAX_I2C_BUS                     2
+#define        I2C_MULTI_BUS                   1
 #else
-#define CONFIG_SYS_MAX_I2C_BUS         1
-#define I2C_GET_BUS()          0
-#define I2C_SET_BUS(a)
+#define        MAX_I2C_BUS                     1
+#define        I2C_MULTI_BUS                   0
+#endif
+
+#if !defined(CONFIG_SYS_MAX_I2C_BUS)
+#define CONFIG_SYS_MAX_I2C_BUS         MAX_I2C_BUS
 #endif
 
 /* define the I2C bus number for RTC and DTT if not already done */
@@ -236,4 +236,18 @@ int i2c_set_bus_speed(unsigned int);
 
 unsigned int i2c_get_bus_speed(void);
 
+/* NOTE: These two functions MUST be always_inline to avoid code growth! */
+static inline unsigned int I2C_GET_BUS(void) __attribute__((always_inline));
+static inline unsigned int I2C_GET_BUS(void)
+{
+       return I2C_MULTI_BUS ? i2c_get_bus_num() : 0;
+}
+
+static inline void I2C_SET_BUS(unsigned int bus) __attribute__((always_inline));
+static inline void I2C_SET_BUS(unsigned int bus)
+{
+       if (I2C_MULTI_BUS)
+               i2c_set_bus_num(bus);
+}
+
 #endif /* _I2C_H_ */