Users of API provided by THERMAL_OF config may suffer when
CONFIG_THERMAL=y, causing linking issues, such as:

drivers/built-in.o: In function `lm75_remove':
lm75.c:(.text+0x12bd8c): undefined reference to 
`thermal_zone_of_sensor_unregister'
drivers/built-in.o: In function `lm75_probe':
lm75.c:(.text+0x12c123): undefined reference to 
`thermal_zone_of_sensor_register'

Therefore, this patch limits the compilation build to always
have THERMAL=y, whenever THERMAL_OF=y. In this way, whenever
the API user is built, if THERMAL_OF=y, the build shall have
the full thermal support, otherwise, the thermal API will provide
stubs.

Cc: Zhang Rui <rui.zh...@intel.com>
Cc: Jean Delvare <kh...@linux-fr.org>
Cc: Guenter Roeck <li...@roeck-us.net>
Cc: linux...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reported-by: Randy Dunlap <rdun...@infradead.org>
Signed-off-by: Eduardo Valentin <eduardo.valen...@ti.com>
---
 drivers/thermal/Kconfig | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 58f98bd..dc315e9 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -29,19 +29,6 @@ config THERMAL_HWMON
          Say 'Y' here if you want all thermal sensors to
          have hwmon sysfs interface too.
 
-config THERMAL_OF
-       bool
-       prompt "APIs to parse thermal data out of device tree"
-       depends on OF
-       default y
-       help
-         This options provides helpers to add the support to
-         read and parse thermal data definitions out of the
-         device tree blob.
-
-         Say 'Y' here if you need to build thermal infrastructure
-         based on device tree.
-
 choice
        prompt "Default Thermal governor"
        default THERMAL_DEFAULT_GOV_STEP_WISE
@@ -235,3 +222,19 @@ source "drivers/thermal/samsung/Kconfig"
 endmenu
 
 endif
+
+menuconfig THERMAL_OF
+       bool
+       prompt "APIs to parse thermal data out of device tree"
+       depends on OF
+       select THERMAL
+       default y
+       help
+         This options enables DT thermal API which adds support to
+         read and parse thermal data definitions out of the
+         device tree blob. This option is mostly used by embedded
+         thermal drivers.
+
+         Say 'Y' here if you need to build thermal infrastructure
+         based on device tree.
+
-- 
1.8.2.1.342.gfa7285d

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to