From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Date: Mon, 16 Nov 2015 16:56:39 +0000 Subject: [lm-sensors] [PATCH] hwmon: scpi: add thermal-of dependency Message-Id: <4264967.aVlONpCXFM@wuerfel> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Guenter Roeck , Jean Delvare Cc: Punit Agrawal , lm-sensors@lm-sensors.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 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 _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Mon, 16 Nov 2015 17:56:39 +0100 Subject: [PATCH] hwmon: scpi: add thermal-of dependency Message-ID: <4264967.aVlONpCXFM@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752959AbbKPQ6i (ORCPT ); Mon, 16 Nov 2015 11:58:38 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:51833 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752860AbbKPQ6h (ORCPT ); Mon, 16 Nov 2015 11:58:37 -0500 From: Arnd Bergmann To: Guenter Roeck , Jean Delvare Cc: Punit Agrawal , lm-sensors@lm-sensors.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] hwmon: scpi: add thermal-of dependency Date: Mon, 16 Nov 2015 17:56:39 +0100 Message-ID: <4264967.aVlONpCXFM@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:/oB9fIxMFKg7z4GvX8pP+bIgd37IX52JqvCjSSU4tWgcqlj7Mbx xwgCKbPIb5WEGGFL6vbnfUujAQRuijH7poKckgp3wZjoLaTC0Ql/q0TLk3qNZhNUcbHKQ4f 9aO4H8P9xSLQD5t97YbgvTuuGx5h8Cz/G4R2xUpF63RXK1Zxr+mtjV5hH0IaN8SzHG8F3rk qmdemEi/0Ou7Xv+ic5L8A== X-UI-Out-Filterresults: notjunk:1;V01:K0:fIO0RhDH4Ps=:eZRIvnvcZkVJY5V4Bijgiw miA52rr/UTbQ0D/aq+eGDDaPnZKM5f+IxLqUlLaOiiG4b0ld2Jv9vt+a7HO9VtZyKOgRYxa8T bWsZ8WZ41e2td/alrOq18/liWiUczvaLOoN8M407KOnilkkB5nxISLmzWrO/WZr7/N8m0RnUl EV8majDheo1mhfu1bw5cVwb+lso0UrbV14TKQRVDh0diNGirO8t1G0tRw8/ERg6oOtkO42LwT /XxM5bWUYLivDD268/ciCBd/1t5/w0QeHo+9rJTyCtBeYzz/lwA0GDbRxn4KWQWm3Bg70SnsF ZNYZqUJv+CL/Xm/Ue7qpmu0RKhh9RcCnslel/z/1LYdTxv7ydGOWzKcxSoYcAjeJt1Lql0LUs y8TITosX6zfmUNqS/Dc865tHu5UMeuU0NY2Hhg8ZdBRd8XGbMx9NZfODmTdPMFahPFPoeTRM6 7HWKUzI6EFZecV7M3E9+N679Vk3R8S870lPXCnNT0FaeR5r9jOBd4iFTemGQgQzzsN4tParw+ 94T8639rMAVdTXFDJQvqCzWnKq8HHwc/rHm2TvZF8Uf0zBh1mXRJ/zvO+EumxrIQYTCO881xV z+BNDRYLcDe2klKRvUmcMu53n1qHWqGgZrw0kleVwdlvlGOoDpl8gjtmmz2mTJVoEeh4/qFlH f4wAT0RWxZHnHx3u0XlVpO/EJzFUga+LZ9A4idcTQ0R8hLF3wpeAiPfLGDPiHQhcck7AIx7P5 I0LzpGzEMYqRMtNn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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