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: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

4 files changed, 5 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index 6ca24427e184..42b2e49b2836 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -371,7 +371,7 @@ static int ath10k_debug_fw_stats_request(struct ath10k *ar)
 
                 ret = wait_for_completion_timeout(&ar->debug.fw_stats_complete,
                                                   1*HZ);
-                if (ret <= 0)
+                if (ret == 0)
                         return -ETIMEDOUT;
 
                 spin_lock_bh(&ar->data_lock);
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index f1946a6be442..2fd9e180272b 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -703,11 +703,9 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
         /* wait for response */
         status = wait_for_completion_timeout(&htc->ctl_resp,
                                              ATH10K_HTC_CONN_SVC_TIMEOUT_HZ);
-        if (status <= 0) {
-                if (status == 0)
-                        status = -ETIMEDOUT;
+        if (status == 0) {
                 ath10k_err(ar, "Service connect timeout: %d\n", status);
-                return status;
+                return -ETIMEDOUT;
         }
 
         /* we controlled the buffer creation, it's aligned */
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index ceec76426070..4f59ab923e48 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -101,7 +101,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
 
         status = wait_for_completion_timeout(&htt->target_version_received,
                                              HTT_TARGET_VERSION_TIMEOUT_HZ);
-        if (status <= 0) {
+        if (status == 0) {
                 ath10k_warn(ar, "htt version request timed out\n");
                 return -ETIMEDOUT;
         }
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index c7febfc9c68f..b403cba0afc1 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2228,7 +2228,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
 
                 ret = wait_for_completion_timeout(&ar->offchan_tx_completed,
                                                   3 * HZ);
-                if (ret <= 0)
+                if (ret == 0)
                         ath10k_warn(ar, "timed out waiting for offchannel skb %p\n",
                                     skb);