lkml.org 
[lkml]   [2014]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/1] thermal: fix compilation issue on CONFIG_THERMAL_OF dependencies
On 01/07/2014 04:44 AM, Eduardo Valentin wrote:
> 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.zhang@intel.com>
> Cc: Jean Delvare <khali@linux-fr.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Eduardo Valentin <eduardo.valentin@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.
> +
>

Alternative would be something like

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index f7e11c7..156bb4d 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -244,7 +244,7 @@ struct thermal_genl_event {
};

/* Function declarations */
-#ifdef CONFIG_THERMAL_OF
+#if defined(CONFIG_THERMAL_OF) && (defined(CONFIG_THERMAL) || (defined(MODULE) && defined(CONFIG_THERMAL_MODULE)))
struct thermal_zone_device *
thermal_zone_of_sensor_register(struct device *dev, int id,
void *data, int (*get_temp)(void *, long *),
but your patch should work as well (or even better as it won't cause confusion).

Guenter



\
 
 \ /
  Last update: 2014-01-07 16:21    [W:0.113 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site