ath11k: fix compiler warnings without CONFIG_THERMAL

YueHaibing · Kalle Valo · commit c9be1a642a7b · 2020-04-06T17:21:23.000+03:00
drivers/net/wireless/ath/ath11k/thermal.h:45:1: warning: no return statement in function returning non-void [-Wreturn-type] drivers/net/wireless/ath/ath11k/core.c:416:28: error: passing argument 1 of 'ath11k_thermal_unregister' from incompatible pointer type [-Werror=incompatible-pointer-types] Add missing return 0 in ath11k_thermal_set_throttling, and fix ath11k_thermal_unregister param type. Fixes: 2a63bbc ("ath11k: add thermal cooling device support") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200403083414.31392-1-yuehaibing@huawei.com
diff --git a/drivers/net/wireless/ath/ath11k/thermal.h b/drivers/net/wireless/ath/ath11k/thermal.h
@@ -36,12 +36,13 @@ static inline int ath11k_thermal_register(struct ath11k_base *sc)
 	return 0;
 }
 
-static inline void ath11k_thermal_unregister(struct ath11k *ar)
+static inline void ath11k_thermal_unregister(struct ath11k_base *sc)
 {
 }
 
 static inline int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)
 {
+	return 0;
 }
 
 static inline void ath11k_thermal_event_temperature(struct ath11k *ar,

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,13 @@ static inline int ath11k_thermal_register(struct ath11k_base *sc)`
`36`	`36`	`return 0;`
`37`	`37`	`}`
`38`	`38`
`39`		`-static inline void ath11k_thermal_unregister(struct ath11k *ar)`
	`39`	`+static inline void ath11k_thermal_unregister(struct ath11k_base *sc)`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static inline int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)`
`44`	`44`	`{`
	`45`	`+ return 0;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`static inline void ath11k_thermal_event_temperature(struct ath11k *ar,`