diff options
| author | Heiko Schocher <hs@denx.de> | 2013-10-04 07:36:34 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2013-10-17 07:20:25 +0200 |
| commit | 13c2433ccb4d9a5efb95ad953c2b3a0eb1909988 (patch) | |
| tree | 07ae7a7a85312a50dc132a40a1e54ddf98652350 /drivers/i2c/i2c_core.c | |
| parent | 1086bfa9f49127e40a92b1225af1ed5e41f8fa1c (diff) | |
| download | blackbird-obmc-uboot-13c2433ccb4d9a5efb95ad953c2b3a0eb1909988.tar.gz blackbird-obmc-uboot-13c2433ccb4d9a5efb95ad953c2b3a0eb1909988.zip | |
i2c, core: optimze i2c_set_bus_num()
check first, if we are on the bus, we want to enable. If so,
return immediately, do not calc max adapter number, nor check
other things.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Diffstat (limited to 'drivers/i2c/i2c_core.c')
| -rw-r--r-- | drivers/i2c/i2c_core.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index b263562edf..fe341cde64 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -283,20 +283,22 @@ unsigned int i2c_get_bus_num(void) */ int i2c_set_bus_num(unsigned int bus) { - int max = ll_entry_count(struct i2c_adapter, i2c); + int max; + + if ((bus == I2C_BUS) && (I2C_ADAP->init_done > 0)) + return 0; - if (I2C_ADAPTER(bus) >= max) { - printf("Error, wrong i2c adapter %d max %d possible\n", - I2C_ADAPTER(bus), max); - return -2; - } #ifndef CONFIG_SYS_I2C_DIRECT_BUS if (bus >= CONFIG_SYS_NUM_I2C_BUSES) return -1; #endif - if ((bus == I2C_BUS) && (I2C_ADAP->init_done > 0)) - return 0; + max = ll_entry_count(struct i2c_adapter, i2c); + if (I2C_ADAPTER(bus) >= max) { + printf("Error, wrong i2c adapter %d max %d possible\n", + I2C_ADAPTER(bus), max); + return -2; + } #ifndef CONFIG_SYS_I2C_DIRECT_BUS i2c_mux_disconnet_all(); |
