Skip to contentSkip to conversation

ath10k: Fix check for !THERMAL case

PATCH New Mark Brown 2 participants 2 messages Nov 26, 2015 – Nov 27, 2015 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ath10k: Fix check for !THERMAL case

When defining stubs for !THERMAL cases we currently check if CONFIG_THERMAL is defined but this fails when the thermal code is built as a module in which case CONFIG_THERMAL_MODULE is defined instead causing us to define the stubs as well as building the actual ath10k thermal code which in turn causes the build to fail on arm64 allmodconfig. Fix this by changing the check in the header to use IS_ENABLED().

---
 drivers/net/wireless/ath/ath10k/thermal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/thermal.h +1 -1
index b610ea5caae8..793eec160e65 100644
@@ -36,7 +36,7 @@ struct ath10k_thermal {
 	int temperature;
 };
 
-#ifdef CONFIG_THERMAL
+#if IS_ENABLED(CONFIG_THERMAL)
 int ath10k_thermal_register(struct ath10k *ar);
 void ath10k_thermal_unregister(struct ath10k *ar);
 void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
Signature · 7 lines
2.6.2


_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#1 lore raw
reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree…

Hi Mark,

[auto build test ERROR on net-next/master]
[also build test ERROR on v4.4-rc2]
[cannot apply to next-20151127]

url:    https://github.com/0day-ci/linux/commits/Mark-Brown/ath10k-Fix-check-for-THERMAL-case/20151126-201844
config: m68k-allmodconfig (attached as .config)

reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=m68k

All errors (new ones prefixed by >>):

>> ERROR: "ath10k_thermal_event_temperature" [drivers/net/wireless/ath/ath10k/ath10k_core.ko] undefined!
>> ERROR: "ath10k_thermal_set_throttling" [drivers/net/wireless/ath/ath10k/ath10k_core.ko] undefined!
>> ERROR: "ath10k_thermal_register" [drivers/net/wireless/ath/ath10k/ath10k_core.ko] undefined!
>> ERROR: "ath10k_thermal_unregister" [drivers/net/wireless/ath/ath10k/ath10k_core.ko] undefined!

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation