Skip to contentSkip to conversation

Revert "thermal: qcom_spmi: allow compile test"

PATCH In review Arnd Bergmann 2 participants 2 messages Nov 16, 2015 – Nov 17, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "thermal: qcom_spmi: allow compile test"

This just caused build errors:

warning: (QCOM_SPMI_TEMP_ALARM) selects REGMAP_SPMI which has unmet direct dependencies (SPMI) drivers/built-in.o: In function `regmap_spmi_ext_gather_write':
:(.text+0x609b0): undefined reference to spmi_ext_register_write' :(.text+0x609f0): undefined reference to spmi_ext_register_writel'

While it's generally a good idea to allow compile testing, in this case, it just doesn't work, so reverting the patch that introduced the compile-test variant seems the most appropriate solution.

Note that SPIMI also has a 'depends on ARCH_QCOM || COMPILE_TEST' statement, so we should be able to enable SPMI on all architectures for compile testing already.

Fixes cb7fb4d34202 ("thermal: qcom_spmi: allow compile test")
drivers/thermal/Kconfig +1 -1
index 2e7524f0f3f7..6045b17d0e00 100644
@@ -381,7 +381,7 @@ endmenu
 
 config QCOM_SPMI_TEMP_ALARM
 	tristate "Qualcomm SPMI PMIC Temperature Alarm"
-	depends on OF && (SPMI || COMPILE_TEST) && IIO
+	depends on OF && SPMI && IIO
 	select REGMAP_SPMI
 	help
 	  This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
#1 lore raw
Quoted 11 lines · Arnd Bergmann

This just caused build errors:

warning: (QCOM_SPMI_TEMP_ALARM) selects REGMAP_SPMI which has unmet direct dependencies (SPMI) drivers/built-in.o: In function `regmap_spmi_ext_gather_write':
:(.text+0x609b0): undefined reference to spmi_ext_register_write' :(.text+0x609f0): undefined reference to spmi_ext_register_writel'

While it's generally a good idea to allow compile testing, in this case, it just doesn't work, so reverting the patch that introduced the compile-test variant seems the most appropriate solution.

Looking this closer, the original patch simply does not make sense. The platform dependent code is already covered by the SPMI code.

Quoted 4 lines

Note that SPIMI also has a 'depends on ARCH_QCOM || COMPILE_TEST' statement, so we should be able to enable SPMI on all architectures for compile testing already.

So, applied. I just s/SPIMI/SPMI/g.

Quoted 18 lines
Fixes cb7fb4d34202 ("thermal: qcom_spmi: allow compile test")
drivers/thermal/Kconfig +1 -1
index 2e7524f0f3f7..6045b17d0e00 100644
@@ -381,7 +381,7 @@ endmenu
 
 config QCOM_SPMI_TEMP_ALARM
 	tristate "Qualcomm SPMI PMIC Temperature Alarm"
-	depends on OF && (SPMI || COMPILE_TEST) && IIO
+	depends on OF && SPMI && IIO
 	select REGMAP_SPMI
 	help
 	  This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)