| Message ID | 1420720054-27870-1-git-send-email-der.herr@hofr.at (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Nicholas Mc Guire <der.herr@hofr.at> writes: > 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. > > v2: all wait_for_completion_timeout changes in a single patch > v3: patch formatting cleanups - no change of actual patch > > Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> > --- > patch was only compile tested x86_64_defconfig + CONFIG_ATH_CARDS=m > CONFIG_ATH10K=m > > patch is against linux-next 3.19.0-rc1 -next-20141226 > > None of the proposed cleanups are critical. > All changes should only be removing unreachable cases. Sorry, I wasn't clear enough in my last email but everything related to v2, v3 etc should be after "---" line. I fixed this in ath-next-test branch and will apply your patch once kbuild has run it's tests.
Nicholas Mc Guire <der.herr@hofr.at> writes: > 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> Thanks, applied to ath.git.
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index a716758..7e1fe93 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -373,7 +373,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 f1946a6..2fd9e18 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 56cb4ac..58b6fc1 100644 --- a/drivers/net/wireless/ath/ath10k/htt.c +++ b/drivers/net/wireless/ath/ath10k/htt.c @@ -102,7 +102,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 c400567..f9d7dbb 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2151,7 +2151,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);
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. v2: all wait_for_completion_timeout changes in a single patch v3: patch formatting cleanups - no change of actual patch Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> --- patch was only compile tested x86_64_defconfig + CONFIG_ATH_CARDS=m CONFIG_ATH10K=m patch is against linux-next 3.19.0-rc1 -next-20141226 None of the proposed cleanups are critical. All changes should only be removing unreachable cases. drivers/net/wireless/ath/ath10k/debug.c | 2 +- drivers/net/wireless/ath/ath10k/htc.c | 6 ++---- drivers/net/wireless/ath/ath10k/htt.c | 2 +- drivers/net/wireless/ath/ath10k/mac.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-)