On Thu, 21 Jul 2016 12:11:01 -0400, Javier Martinez Canillas wrote: > The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either > built-in or as a module, use that macro instead of open coding the same. > > Using the macro makes the code more readable by helping abstract away some > of the Kconfig built-in and module enable details. > > Signed-off-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx> > --- > > drivers/i2c/busses/i2c-i801.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index 68cec6128ac0..5ef9b733d153 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -98,8 +98,7 @@ > #include <linux/platform_data/itco_wdt.h> > #include <linux/pm_runtime.h> > > -#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ > - defined CONFIG_DMI > +#if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI > #include <linux/gpio.h> > #include <linux/i2c-mux-gpio.h> > #endif > @@ -255,8 +254,7 @@ struct i801_priv { > int len; > u8 *data; > > -#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ > - defined CONFIG_DMI > +#if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI > const struct i801_mux_config *mux_drvdata; > struct platform_device *mux_pdev; > #endif > @@ -1133,8 +1131,7 @@ static void __init input_apanel_init(void) {} > static void i801_probe_optional_slaves(struct i801_priv *priv) {} > #endif /* CONFIG_X86 && CONFIG_DMI */ > > -#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ > - defined CONFIG_DMI > +#if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI > static struct i801_mux_config i801_mux_config_asus_z8_d12 = { > .gpio_chip = "gpio_ich", > .values = { 0x02, 0x03 }, Reviewed-by: Jean Delvare <jdelvare@xxxxxxx> -- Jean Delvare SUSE L3 Support -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html