Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933105AbcDYQTq (ORCPT ); Mon, 25 Apr 2016 12:19:46 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37984 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932882AbcDYQTp (ORCPT ); Mon, 25 Apr 2016 12:19:45 -0400 Date: Mon, 25 Apr 2016 17:19:44 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH] mfd: Use IS_ENABLED(CONFIG_FOO) instead of checking FOO || FOO_MODULE Message-ID: <20160425161944.GM2713@dell> References: <1461174346-27886-1-git-send-email-javier@osg.samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1461174346-27886-1-git-send-email-javier@osg.samsung.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2741 Lines: 86 On Wed, 20 Apr 2016, 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. > > Signed-off-by: Javier Martinez Canillas > > --- Applied, thanks. > drivers/mfd/dm355evm_msp.c | 8 ++++---- > drivers/mfd/wm8400-core.c | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c > index ec4438ed2faf..04c25c4a8ff4 100644 > --- a/drivers/mfd/dm355evm_msp.c > +++ b/drivers/mfd/dm355evm_msp.c > @@ -33,25 +33,25 @@ > * This driver was tested with firmware revision A4. > */ > > -#if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE) > +#if IS_ENABLED(CONFIG_INPUT_DM355EVM) > #define msp_has_keyboard() true > #else > #define msp_has_keyboard() false > #endif > > -#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) > +#if IS_ENABLED(CONFIG_LEDS_GPIO) > #define msp_has_leds() true > #else > #define msp_has_leds() false > #endif > > -#if defined(CONFIG_RTC_DRV_DM355EVM) || defined(CONFIG_RTC_DRV_DM355EVM_MODULE) > +#if IS_ENABLED(CONFIG_RTC_DRV_DM355EVM) > #define msp_has_rtc() true > #else > #define msp_has_rtc() false > #endif > > -#if defined(CONFIG_VIDEO_TVP514X) || defined(CONFIG_VIDEO_TVP514X_MODULE) > +#if IS_ENABLED(CONFIG_VIDEO_TVP514X) > #define msp_has_tvp() true > #else > #define msp_has_tvp() false > diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c > index 3bd44a45c378..8f9cbc0fb37a 100644 > --- a/drivers/mfd/wm8400-core.c > +++ b/drivers/mfd/wm8400-core.c > @@ -156,7 +156,7 @@ void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400) > } > EXPORT_SYMBOL_GPL(wm8400_reset_codec_reg_cache); > > -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) > +#if IS_ENABLED(CONFIG_I2C) > static int wm8400_i2c_probe(struct i2c_client *i2c, > const struct i2c_device_id *id) > { > @@ -205,7 +205,7 @@ static int __init wm8400_module_init(void) > { > int ret = -ENODEV; > > -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) > +#if IS_ENABLED(CONFIG_I2C) > ret = i2c_add_driver(&wm8400_i2c_driver); > if (ret != 0) > pr_err("Failed to register I2C driver: %d\n", ret); > @@ -217,7 +217,7 @@ subsys_initcall(wm8400_module_init); > > static void __exit wm8400_module_exit(void) > { > -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) > +#if IS_ENABLED(CONFIG_I2C) > i2c_del_driver(&wm8400_i2c_driver); > #endif > } -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog