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

[Kalle Valo]

Geliang Tang  writes:

> WARN_ON() already contain an unlikely compiler flag. Drop it.
>
> Signed-off-by: Geliang Tang 

Applied, thanks.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Geliang Tang]

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

Signed-off-by: Geliang Tang 
---
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 netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html