Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38e2a644 authored Jan 08, 2015 by Nicholas Mc Guire Committed by Kalle Valo Jan 13, 2015

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>

parent 49274332

drivers/net/wireless/ath/ath10k/debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/net/wireless/ath/ath10k/htc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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 */

drivers/net/wireless/ath/ath10k/htt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/net/wireless/ath/ath10k/mac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);