projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
976358e
)
Input: ads7846 - use IS_ENABLED() macro
author
Fabio Estevam
<
[email protected]
>
Mon, 2 Dec 2013 06:11:26 +0000
(22:11 -0800)
committer
Dmitry Torokhov
<
[email protected]
>
Mon, 2 Dec 2013 06:16:44 +0000
(22:16 -0800)
Using the IS_ENABLED() macro can make the code shorter and simpler
Signed-off-by: Fabio Estevam <
[email protected]
>
Signed-off-by: Dmitry Torokhov <
[email protected]
>
drivers/input/touchscreen/ads7846.c
patch
|
blob
|
history
diff --git
a/drivers/input/touchscreen/ads7846.c
b/drivers/input/touchscreen/ads7846.c
index ea195360747ef7a27119f84dfce26dc4a9d12d3a..569578638233b6b49bd638916cfc5eb1ea55c13e 100644
(file)
--- 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) \