Commit 38e2a644 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kalle Valo

ath10k: fixup wait_for_completion_timeout return handling

wait_for_completion_timeout does not return negative values so the tests
for <= 0 are not needed and the case differentiation in the error handling
path unnecessary.
Signed-off-by: default avatarNicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 49274332
...@@ -371,7 +371,7 @@ static int ath10k_debug_fw_stats_request(struct ath10k *ar) ...@@ -371,7 +371,7 @@ static int ath10k_debug_fw_stats_request(struct ath10k *ar)
ret = wait_for_completion_timeout(&ar->debug.fw_stats_complete, ret = wait_for_completion_timeout(&ar->debug.fw_stats_complete,
1*HZ); 1*HZ);
if (ret <= 0) if (ret == 0)
return -ETIMEDOUT; return -ETIMEDOUT;
spin_lock_bh(&ar->data_lock); spin_lock_bh(&ar->data_lock);
......
...@@ -703,11 +703,9 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc, ...@@ -703,11 +703,9 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
/* wait for response */ /* wait for response */
status = wait_for_completion_timeout(&htc->ctl_resp, status = wait_for_completion_timeout(&htc->ctl_resp,
ATH10K_HTC_CONN_SVC_TIMEOUT_HZ); ATH10K_HTC_CONN_SVC_TIMEOUT_HZ);
if (status <= 0) { if (status == 0) {
if (status == 0)
status = -ETIMEDOUT;
ath10k_err(ar, "Service connect timeout: %d\n", status); ath10k_err(ar, "Service connect timeout: %d\n", status);
return status; return -ETIMEDOUT;
} }
/* we controlled the buffer creation, it's aligned */ /* we controlled the buffer creation, it's aligned */
......
...@@ -101,7 +101,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt) ...@@ -101,7 +101,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
status = wait_for_completion_timeout(&htt->target_version_received, status = wait_for_completion_timeout(&htt->target_version_received,
HTT_TARGET_VERSION_TIMEOUT_HZ); HTT_TARGET_VERSION_TIMEOUT_HZ);
if (status <= 0) { if (status == 0) {
ath10k_warn(ar, "htt version request timed out\n"); ath10k_warn(ar, "htt version request timed out\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
......
...@@ -2228,7 +2228,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) ...@@ -2228,7 +2228,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
ret = wait_for_completion_timeout(&ar->offchan_tx_completed, ret = wait_for_completion_timeout(&ar->offchan_tx_completed,
3 * HZ); 3 * HZ);
if (ret <= 0) if (ret == 0)
ath10k_warn(ar, "timed out waiting for offchannel skb %p\n", ath10k_warn(ar, "timed out waiting for offchannel skb %p\n",
skb); skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment