Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1239513

[PATCH v2] ath6kl: drop unlikely behind WARN_ON()

From Geliang Tang <geliangtang@163.com>
Newsgroups linux.kernel
Subject [PATCH v2] ath6kl: drop unlikely behind WARN_ON()
Date 2015-10-05 14:50 +0200
Message-ID <qgdnj-7Bp-5@gated-at.bofh.it> (permalink)
References <qgc7U-5TG-15@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


WARN_ON() already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
Changes in v2:
 - change subject prefix to ath6kl.
---
 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index a511ef3..fe38fc4 100644
--- 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;
 
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH] cfg80211: drop unlikely behind WARN_ON() Geliang Tang <geliangtang@163.com> - 2015-10-04 09:20 +0200
  Re: [PATCH] cfg80211: drop unlikely behind WARN_ON() Johannes Berg <johannes@sipsolutions.net> - 2015-10-05 09:00 +0200
    Re: [PATCH] cfg80211: drop unlikely behind WARN_ON() Kalle Valo <kvalo@qca.qualcomm.com> - 2015-10-05 13:30 +0200
      [PATCH v2] ath6kl: drop unlikely behind WARN_ON() Geliang Tang <geliangtang@163.com> - 2015-10-05 14:50 +0200
        Re: [PATCH v2] ath6kl: drop unlikely behind WARN_ON() Kalle Valo <kvalo@codeaurora.org> - 2015-10-09 10:50 +0200

csiph-web