summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFabio Estevam2013-12-02 07:11:26 +0100
committerDmitry Torokhov2013-12-02 07:16:44 +0100
commitc52b4fc7817579c88db55b2029db7bf2e9d4c934 (patch)
treedf579f2389cc33b073333ea77a1aa9b15d28ea38 /drivers
parentInput: add a new driver for GPIO beeper (diff)
downloadkernel-qcow2-linux-c52b4fc7817579c88db55b2029db7bf2e9d4c934.tar.gz
kernel-qcow2-linux-c52b4fc7817579c88db55b2029db7bf2e9d4c934.tar.xz
kernel-qcow2-linux-c52b4fc7817579c88db55b2029db7bf2e9d4c934.zip
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')
-rw-r--r--drivers/input/touchscreen/ads7846.c4
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 {
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) \