leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath10k: harmonize error case handling in ath10k_core_start

Browse Source 
All of the bringup/init functions called in ath10k_core_start return 0
on success and != 0 on failure. ath10k_wmi_wait_for_service_ready(),
ath10k_wmi_wait_for_unified_ready() and their call sites were adjusted
to fit this model.
The return type of wait_for_completion_timeout is unsigned long not int so
ath10k_wmi_wait_for_service_ready() and ath10k_wmi_wait_for_unified_ready()
were fixed up accordingly.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Nicholas Mc Guire 2015-03-30 15:39:21 +03:00 committed by Kalle Valo
parent a7a42849cd
commit 9eea56895f
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ath/ath10k/core.c
View File

@ -1123,9 +1123,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
if (mode == ATH10K_FIRMWARE_MODE_NORMAL) { if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {
status = ath10k_wmi_wait_for_service_ready(ar); status = ath10k_wmi_wait_for_service_ready(ar);
if (status <= 0) { if (status) {
ath10k_warn(ar, "wmi service ready event not received"); ath10k_warn(ar, "wmi service ready event not received");
status = -ETIMEDOUT;
goto err_hif_stop; goto err_hif_stop;
} }
} }
@ -1141,9 +1140,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
} }
status = ath10k_wmi_wait_for_unified_ready(ar); status = ath10k_wmi_wait_for_unified_ready(ar);
if (status <= 0) { if (status) {
ath10k_err(ar, "wmi unified ready event not received\n"); ath10k_err(ar, "wmi unified ready event not received\n");
status = -ETIMEDOUT;
goto err_hif_stop; goto err_hif_stop;
} }

16
drivers/net/wireless/ath/ath10k/wmi.c
View File

@ -885,20 +885,24 @@ void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
int ath10k_wmi_wait_for_service_ready(struct ath10k *ar) int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
{ {
int ret; unsigned long time_left;
ret = wait_for_completion_timeout(&ar->wmi.service_ready, time_left = wait_for_completion_timeout(&ar->wmi.service_ready,
WMI_SERVICE_READY_TIMEOUT_HZ); WMI_SERVICE_READY_TIMEOUT_HZ);
return ret; if (!time_left)
return -ETIMEDOUT;
return 0;
} }
int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar) int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)
{ {
int ret; unsigned long time_left;
ret = wait_for_completion_timeout(&ar->wmi.unified_ready, time_left = wait_for_completion_timeout(&ar->wmi.unified_ready,
WMI_UNIFIED_READY_TIMEOUT_HZ); WMI_UNIFIED_READY_TIMEOUT_HZ);
return ret; if (!time_left)
return -ETIMEDOUT;
return 0;
} }
struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len) struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len)