diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2019-04-02 18:12:50 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2019-05-06 20:35:24 +0800 |
| commit | f37353320ee9905ef7aaba4c67eae85496bee950 (patch) | |
| tree | 0044c8794bca5822c0d8ccec4efffdabd51e5807 /drivers/hwmon | |
| parent | 2e31c8560a564a70f13e3b6acab49bffbe41e965 (diff) | |
| download | linux-stable-f37353320ee9905ef7aaba4c67eae85496bee950.tar.gz linux-stable-f37353320ee9905ef7aaba4c67eae85496bee950.tar.bz2 linux-stable-f37353320ee9905ef7aaba4c67eae85496bee950.zip | |
hwmon/drivers/core: Simplify complex dependency
As the thermal framework does not longer compile as a module, we can
simplify this condition below:
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \
(!defined(CONFIG_THERMAL_HWMON) || \
!(defined(MODULE) && IS_MODULE(CONFIG_THERMAL)))
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \
(!defined(CONFIG_THERMAL_HWMON) || \
!(defined(MODULE) && 0))
=> (whatever && 0) = 0
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \
(!defined(CONFIG_THERMAL_HWMON) || !(0))
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \
(!defined(CONFIG_THERMAL_HWMON) || 1)
=> (whatever || 1) = 1
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \
(1)
=> (whatever && 1) = whatever
if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF)
CONFIG_THERMAL can not be a module anymore, then:
if defined(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF)
And CONFIG_THERMAL_OF already depends on CONFIG_THERMAL, so:
if defined(CONFIG_THERMAL_OF)
Thus,
ifdef CONFIG_THERMAL_OF
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/hwmon.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index c22dc1e07911..6f76f2484db0 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -118,9 +118,7 @@ static DEFINE_IDA(hwmon_ida); * The complex conditional is necessary to avoid a cyclic dependency * between hwmon and thermal_sys modules. */ -#if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ - (!defined(CONFIG_THERMAL_HWMON) || \ - !(defined(MODULE) && IS_MODULE(CONFIG_THERMAL))) +#ifdef CONFIG_THERMAL_OF static int hwmon_thermal_get_temp(void *data, int *temp) { struct hwmon_thermal_data *tdata = data; |