Commit 901a891f authored by Stefan Lengfeld's avatar Stefan Lengfeld Committed by Wolfram Sang

i2c: use macro IS_ENABLED in header i2c.h

Using the macro IS_ENABLED to check the option CONFIG_I2C=(y|m) makes
the code nicer.  No functional change.
Signed-off-by: default avatarStefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 43df43e6
...@@ -55,7 +55,7 @@ typedef int (*i2c_slave_cb_t)(struct i2c_client *, enum i2c_slave_event, u8 *); ...@@ -55,7 +55,7 @@ typedef int (*i2c_slave_cb_t)(struct i2c_client *, enum i2c_slave_event, u8 *);
struct module; struct module;
struct property_entry; struct property_entry;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
/* /*
* The master routines are the ones normally used to transmit data to devices * The master routines are the ones normally used to transmit data to devices
* on a bus (or read from them). Apart from two basic transfer functions to * on a bus (or read from them). Apart from two basic transfer functions to
...@@ -354,7 +354,7 @@ struct i2c_board_info { ...@@ -354,7 +354,7 @@ struct i2c_board_info {
.type = dev_type, .addr = (dev_addr) .type = dev_type, .addr = (dev_addr)
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
/* Add-on boards should register/unregister their devices; e.g. a board /* Add-on boards should register/unregister their devices; e.g. a board
* with integrated I2C, a config eeprom, sensors, and a codec that's * with integrated I2C, a config eeprom, sensors, and a codec that's
* used in conjunction with the primary hardware. * used in conjunction with the primary hardware.
...@@ -706,7 +706,7 @@ i2c_unlock_adapter(struct i2c_adapter *adapter) ...@@ -706,7 +706,7 @@ i2c_unlock_adapter(struct i2c_adapter *adapter)
/* administration... /* administration...
*/ */
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
extern int i2c_add_adapter(struct i2c_adapter *); extern int i2c_add_adapter(struct i2c_adapter *);
extern void i2c_del_adapter(struct i2c_adapter *); extern void i2c_del_adapter(struct i2c_adapter *);
extern int i2c_add_numbered_adapter(struct i2c_adapter *); extern int i2c_add_numbered_adapter(struct i2c_adapter *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment