projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 706452b)
ath6kl: drop unlikely behind WARN_ON()
authorGeliang Tang <geliangtang@163.com>
Mon, 5 Oct 2015 12:46:12 +0000 (20:46 +0800)
committerKalle Valo <kvalo@qca.qualcomm.com>
Fri, 9 Oct 2015 08:48:17 +0000 (11:48 +0300)
WARN_ON() already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/cfg80211.c patch | blob | blame | history

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index a511ef3614b9ed098558d1d86a9fec88b2330235..fe38fc40de0f82ddd7f1f1065ac37e2a30cc6d8c 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2217,7 +2217,7 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
 
        /* enter / leave wow suspend on first vif always */
        first_vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!first_vif)) ||
+       if (WARN_ON(!first_vif) ||
            !ath6kl_cfg80211_ready(first_vif))
                return -EIO;
 
@@ -2297,7 +2297,7 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
        int ret;
 
        vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!vif)) ||
+       if (WARN_ON(!vif) ||
            !ath6kl_cfg80211_ready(vif))
                return -EIO;