[PATCH] i2c: use macro IS_ENABLED in header i2c.h

[PATCH] i2c: use macro IS_ENABLED in header i2c.h

[Stefan Lengfeld]

From: Stefan Lengfeld <slengfeld@inovex.de>

Using the macro IS_ENABLED to check the option CONFIG_I2C=(y|m) makes
the code nicer.  No functional change.

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
---
 include/linux/i2c.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index d501d3956f13..9245a269d160 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -55,7 +55,7 @@ typedef int (*i2c_slave_cb_t)(struct i2c_client *, enum i2c_slave_event, u8 *);
 struct module;
 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
  * on a bus (or read from them). Apart from two basic transfer functions to
@@ -352,7 +352,7 @@ struct i2c_board_info {
 	.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
  * with integrated I2C, a config eeprom, sensors, and a codec that's
  * used in conjunction with the primary hardware.
@@ -704,7 +704,7 @@ i2c_unlock_adapter(struct i2c_adapter *adapter)
 
 /* administration...
  */
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 extern int i2c_add_adapter(struct i2c_adapter *);
 extern void i2c_del_adapter(struct i2c_adapter *);
 extern int i2c_add_numbered_adapter(struct i2c_adapter *);
-- 
2.13.5

Re: [PATCH] i2c: use macro IS_ENABLED in header i2c.h

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

On Wed, Nov 01, 2017 at 09:06:41PM +0100, Stefan Lengfeld wrote:
> From: Stefan Lengfeld <slengfeld@inovex.de>
> 
> Using the macro IS_ENABLED to check the option CONFIG_I2C=(y|m) makes
> the code nicer.  No functional change.
> 
> Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]