diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-10-25 11:40:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-27 23:54:08 +0200 |
| commit | cd7b4e82a2969e3db4f9b7b902191a10661409bd (patch) | |
| tree | ee0eb14f3adcada87e18e7d272065e45539dd9d1 /include/i2c.h | |
| parent | 7a129a55926952165b9d336b1a4e2159088e5d82 (diff) | |
| download | u-boot-imx-cd7b4e82a2969e3db4f9b7b902191a10661409bd.zip u-boot-imx-cd7b4e82a2969e3db4f9b7b902191a10661409bd.tar.gz u-boot-imx-cd7b4e82a2969e3db4f9b7b902191a10661409bd.tar.bz2 | |
GCC4.6: Squash warning in cmd_date.c
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>
Diffstat (limited to 'include/i2c.h')
| -rw-r--r-- | include/i2c.h | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/include/i2c.h b/include/i2c.h index 8ceb4c8..ee31034 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -46,16 +46,16 @@ */ #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_ */ |