diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2015-01-07 15:04:10 (GMT) |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2015-01-09 16:12:36 (GMT) |
| commit | 96bba98393f97e4c4bfe29341b3ad2adef32bde2 (patch) | |
| tree | 213eaf2e7cda3f5b5d1b5d78bae7b23dacabd0a0 | |
| parent | 6faab1273f79788a7d90f8c3c99b9b8f3b404c98 (diff) | |
| download | linux-96bba98393f97e4c4bfe29341b3ad2adef32bde2.tar.xz | |
ath10k: fix build error when hwmon is off
kbuild reported a linking error:
ERROR: "devm_hwmon_device_register_with_groups"
[drivers/net/wireless/ath/ath10k/ath10k_core.ko] undefined!
Fix it by returning early and letting the compiler to optimise out the function
call.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/thermal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c index d939135..b14ae8d 100644 --- a/drivers/net/wireless/ath/ath10k/thermal.c +++ b/drivers/net/wireless/ath/ath10k/thermal.c @@ -213,6 +213,11 @@ int ath10k_thermal_register(struct ath10k *ar) if (ar->wmi.op_version != ATH10K_FW_WMI_OP_VERSION_10_2_4) return 0; + /* Avoid linking error on devm_hwmon_device_register_with_groups, I + * guess linux/hwmon.h is missing proper stubs. */ + if (!config_enabled(HWMON)) + return 0; + hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev, "ath10k_hwmon", ar, ath10k_hwmon_groups); |