| Message ID | 20200403083414.31392-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c9be1a642a7b9ec021e3f32e084dc781b3e5216d |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: thermal: Fix build error without CONFIG_THERMAL | expand |
YueHaibing <yuehaibing@huawei.com> writes: > 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. These are warnings, no? "build error" and "compiler warning" are different things, the former breaks the whole build which is super critical, but I'll queue this to v5.7 nevertheless. And I'll change the title to: ath11k: fix compiler warning without CONFIG_THERMAL
YueHaibing <yuehaibing@huawei.com> wrote: > 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: 2a63bbca06b2 ("ath11k: add thermal cooling device support") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Patch applied to wireless-drivers.git, thanks. c9be1a642a7b ath11k: fix compiler warnings without CONFIG_THERMAL
On 2020/4/6 21:02, Kalle Valo wrote: > YueHaibing <yuehaibing@huawei.com> writes: > >> 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. > > These are warnings, no? "build error" and "compiler warning" are > different things, the former breaks the whole build which is super > critical, but I'll queue this to v5.7 nevertheless. And I'll change the > title to: > > ath11k: fix compiler warning without CONFIG_THERMAL Ok , thanks! >
diff --git a/drivers/net/wireless/ath/ath11k/thermal.h b/drivers/net/wireless/ath/ath11k/thermal.h index 459b8d49c184..f9af55f3682d 100644 --- 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,
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: 2a63bbca06b2 ("ath11k: add thermal cooling device support") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/wireless/ath/ath11k/thermal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)