openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath10k: txrx: remove unreachable negative return check and fixup type 

wait_event_timeout(), introduced in 'commit 5e3dd157d7 ("ath10k: mac80211
driver for Qualcomm Atheros 802.11ac CQA98xx devices")' never returns < 0
so the only failure condition to be checked is == 0 (timeout). Further the
return type is long not int - an appropriately named variable is added
and the assignments fixed up.

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-06-15 14:46:43 +03:00 committed by Kalle Valo
parent d4298a3a8c
commit 71c47df4aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,9 +147,9 @@ struct ath10k_peer *ath10k_peer_find_by_id(struct ath10k *ar, int peer_id)
static int ath10k_wait_for_peer_common(struct ath10k *ar, int vdev_id, static int ath10k_wait_for_peer_common(struct ath10k *ar, int vdev_id,
const u8 *addr, bool expect_mapped) const u8 *addr, bool expect_mapped)
{ {
int ret; long time_left;
ret = wait_event_timeout(ar->peer_mapping_wq, ({ time_left = wait_event_timeout(ar->peer_mapping_wq, ({
bool mapped; bool mapped;
spin_lock_bh(&ar->data_lock); spin_lock_bh(&ar->data_lock);
@ -160,7 +160,7 @@ static int ath10k_wait_for_peer_common(struct ath10k *ar, int vdev_id,
test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags)); test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags));
}), 3*HZ); }), 3*HZ);
if (ret <= 0) if (time_left == 0)
return -ETIMEDOUT; return -ETIMEDOUT;
return 0; return 0;