diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-12-02 01:11:26 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-02 01:16:44 -0500 |
commit | c52b4fc7817579c88db55b2029db7bf2e9d4c934 (patch) | |
tree | df579f2389cc33b073333ea77a1aa9b15d28ea38 /drivers/input/touchscreen/ads7846.c | |
parent | 976358e2343566207fed2101ce62ff6fbad7f830 (diff) |
Input: ads7846 - use IS_ENABLED() macro
Using the IS_ENABLED() macro can make the code shorter and simpler
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index ea195360747e..569578638233 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
@@ -101,7 +101,7 @@ struct ads7846 { | |||
101 | struct spi_device *spi; | 101 | struct spi_device *spi; |
102 | struct regulator *reg; | 102 | struct regulator *reg; |
103 | 103 | ||
104 | #if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE) | 104 | #if IS_ENABLED(CONFIG_HWMON) |
105 | struct attribute_group *attr_group; | 105 | struct attribute_group *attr_group; |
106 | struct device *hwmon; | 106 | struct device *hwmon; |
107 | #endif | 107 | #endif |
@@ -421,7 +421,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command) | |||
421 | return status; | 421 | return status; |
422 | } | 422 | } |
423 | 423 | ||
424 | #if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE) | 424 | #if IS_ENABLED(CONFIG_HWMON) |
425 | 425 | ||
426 | #define SHOW(name, var, adjust) static ssize_t \ | 426 | #define SHOW(name, var, adjust) static ssize_t \ |
427 | name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \ | 427 | name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \ |