Commit f3735332 authored Apr 02, 2019 by Daniel Lezcano Committed by Zhang Rui May 06, 2019

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>

parent 2e31c856

drivers/hwmon/hwmon.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message