diff mbox

Input: ads7846 - Use IS_ENABLED() macro

Message ID 1385951651-19605-1-git-send-email-festevam@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabio Estevam Dec. 2, 2013, 2:34 a.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

Using the IS_ENABLED() macro can make the code shorter and simpler

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/input/touchscreen/ads7846.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Dec. 2, 2013, 6:12 a.m. UTC | #1 
On Mon, Dec 02, 2013 at 12:34:11AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Using the IS_ENABLED() macro can make the code shorter and simpler
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied, thank you.

> ---
>  drivers/input/touchscreen/ads7846.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
> index ea19536..5695786 100644
> --- a/drivers/input/touchscreen/ads7846.c
> +++ b/drivers/input/touchscreen/ads7846.c
> @@ -101,7 +101,7 @@ struct ads7846 {
>  	struct spi_device	*spi;
>  	struct regulator	*reg;
>  
> -#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
> +#if IS_ENABLED(CONFIG_HWMON)
>  	struct attribute_group	*attr_group;
>  	struct device		*hwmon;
>  #endif
> @@ -421,7 +421,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
>  	return status;
>  }
>  
> -#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
> +#if IS_ENABLED(CONFIG_HWMON)
>  
>  #define SHOW(name, var, adjust) static ssize_t \
>  name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
> -- 
> 1.8.1.2
>
diff mbox

Patch

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index ea19536..5695786 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -101,7 +101,7 @@  struct ads7846 {
 	struct spi_device	*spi;
 	struct regulator	*reg;
 
-#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+#if IS_ENABLED(CONFIG_HWMON)
 	struct attribute_group	*attr_group;
 	struct device		*hwmon;
 #endif
@@ -421,7 +421,7 @@  static int ads7845_read12_ser(struct device *dev, unsigned command)
 	return status;
 }
 
-#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+#if IS_ENABLED(CONFIG_HWMON)
 
 #define SHOW(name, var, adjust) static ssize_t \
 name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \