Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1270371 > unrolled thread

[PATCH] hwmon: scpi: add thermal-of dependency

Back to article view | Back to linux.kernel

Contents

  [PATCH] hwmon: scpi: add thermal-of dependency Arnd Bergmann <arnd@arndb.de> - 2015-11-16 18:00 +0100
    Re: [PATCH] hwmon: scpi: add thermal-of dependency Guenter Roeck <linux@roeck-us.net> - 2015-11-16 19:00 +0100

#1270371 — [PATCH] hwmon: scpi: add thermal-of dependency

The newly added scpi thermal support is broken when the scpi driver
is built-in but the thermal driver is a loadable module:

drivers/built-in.o: In function `scpi_hwmon_probe':
(.text+0x444d70): undefined reference to `thermal_zone_of_sensor_unregister'
(.text+0x444d94): undefined reference to `thermal_zone_of_sensor_register'
drivers/built-in.o: In function `scpi_hwmon_remove':
(text+0x444e6c): undefined reference to `thermal_zone_of_sensor_unregister'

This uses the same Kconfig trick that we have in a couple of other
drivers already to ensure we can only select the driver in valid
configurations when either THERMAL_OF is disabled, or when with a
dependency on CONFIG_THERMAL that can force SCPI to be a loadable
module in the case I was hitting.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 68acc77a2d51 ("hwmon: Support thermal zones registration for SCP temperature sensors")

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 842b0043ad94..597814177f50 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -324,6 +324,7 @@ config SENSORS_APPLESMC
 config SENSORS_ARM_SCPI
 	tristate "ARM SCPI Sensors"
 	depends on ARM_SCPI_PROTOCOL
+	depends on THERMAL || !THERMAL_OF
 	help
 	  This driver provides support for temperature, voltage, current
 	  and power sensors available on ARM Ltd's SCP based platforms. The

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

[toc] | [next] | [standalone]

#1270431

On 11/16/2015 08:56 AM, Arnd Bergmann wrote:
> The newly added scpi thermal support is broken when the scpi driver
> is built-in but the thermal driver is a loadable module:
>
> drivers/built-in.o: In function `scpi_hwmon_probe':
> (.text+0x444d70): undefined reference to `thermal_zone_of_sensor_unregister'
> (.text+0x444d94): undefined reference to `thermal_zone_of_sensor_register'
> drivers/built-in.o: In function `scpi_hwmon_remove':
> (text+0x444e6c): undefined reference to `thermal_zone_of_sensor_unregister'
>
> This uses the same Kconfig trick that we have in a couple of other
> drivers already to ensure we can only select the driver in valid
> configurations when either THERMAL_OF is disabled, or when with a
> dependency on CONFIG_THERMAL that can force SCPI to be a loadable
> module in the case I was hitting.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 68acc77a2d51 ("hwmon: Support thermal zones registration for SCP temperature sensors")

Applied.

Thanks,
Guenter

>
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 842b0043ad94..597814177f50 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -324,6 +324,7 @@ config SENSORS_APPLESMC
>   config SENSORS_ARM_SCPI
>   	tristate "ARM SCPI Sensors"
>   	depends on ARM_SCPI_PROTOCOL
> +	depends on THERMAL || !THERMAL_OF
>   	help
>   	  This driver provides support for temperature, voltage, current
>   	  and power sensors available on ARM Ltd's SCP based platforms. The
>
>

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web