diff options
| -rw-r--r-- | drivers/i2c/i2c-core.c | 19 | ||||
| -rw-r--r-- | include/linux/i2c.h | 10 |
2 files changed, 8 insertions, 21 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index e62a91a45a291..9011627d7eb03 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1236,22 +1236,6 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags, } -/* You should always define `functionality'; the 'else' is just for - backward compatibility. */ -u32 i2c_get_functionality (struct i2c_adapter *adap) -{ - if (adap->algo->functionality) - return adap->algo->functionality(adap); - else - return 0xffffffff; -} - -int i2c_check_functionality (struct i2c_adapter *adap, u32 func) -{ - u32 adap_func = i2c_get_functionality (adap); - return (func & adap_func) == func; -} - EXPORT_SYMBOL(i2c_add_adapter); EXPORT_SYMBOL(i2c_del_adapter); EXPORT_SYMBOL(i2c_add_driver); @@ -1283,9 +1267,6 @@ EXPORT_SYMBOL(i2c_smbus_write_word_data); EXPORT_SYMBOL(i2c_smbus_write_block_data); EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); -EXPORT_SYMBOL(i2c_get_functionality); -EXPORT_SYMBOL(i2c_check_functionality); - MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>"); MODULE_DESCRIPTION("I2C-Bus main module"); MODULE_LICENSE("GPL"); diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 9f2ae600683c6..ebcd745f4cd6f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -368,10 +368,16 @@ extern void i2c_put_adapter(struct i2c_adapter *adap); /* Return the functionality mask */ -extern u32 i2c_get_functionality (struct i2c_adapter *adap); +static inline u32 i2c_get_functionality(struct i2c_adapter *adap) +{ + return adap->algo->functionality(adap); +} /* Return 1 if adapter supports everything we need, 0 if not. */ -extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func); +static inline int i2c_check_functionality(struct i2c_adapter *adap, u32 func) +{ + return (func & i2c_get_functionality(adap)) == func; +} /* * I2C Message - used for pure i2c transaction, also from /dev interface |