p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2c: reduce parent checking to a NOOP in non-I2C_MUX case 

In 0826374 - i2c: Multiplexed I2C bus core support
core i2c code increased in size and complexity even when I2C_MUX
wasn't selected.

Turning this check into a constant NULL in the n case lets the
client functions in be simplified too, not needing to include
never-called calls to the mux-specific helpers.

Signed-off-by: Phil Carmody <phil.carmody@partner.samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Phil Carmody 2013-06-26 10:56:35 +03:00 committed by Wolfram Sang
parent 8256424553
commit 3923172b3d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/i2c.h
View File

@ -447,11 +447,13 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
static inline struct i2c_adapter * static inline struct i2c_adapter *
i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter) i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
{ {
#if IS_ENABLED(I2C_MUX)
struct device *parent = adapter->dev.parent; struct device *parent = adapter->dev.parent;
if (parent != NULL && parent->type == &i2c_adapter_type) if (parent != NULL && parent->type == &i2c_adapter_type)
return to_i2c_adapter(parent); return to_i2c_adapter(parent);
else else
#endif
return NULL; return NULL;
} }