netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cfg80211: drop unlikely behind WARN_ON()
@ 2015-10-04  7:09 Geliang Tang
  2015-10-05  6:52 ` Johannes Berg
  0 siblings, 1 reply; 5+ messages in thread
From: Geliang Tang @ 2015-10-04  7:09 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Geliang Tang, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

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

Signed-off-by: Geliang Tang <geliangtang-9Onoh4P/yGk@public.gmane.org>
---
 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-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] cfg80211: drop unlikely behind WARN_ON()
  2015-10-04  7:09 [PATCH] cfg80211: drop unlikely behind WARN_ON() Geliang Tang
@ 2015-10-05  6:52 ` Johannes Berg
  2015-10-05 11:23   ` Kalle Valo
  0 siblings, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2015-10-05  6:52 UTC (permalink / raw)
  To: Geliang Tang, Kalle Valo; +Cc: linux-wireless, netdev, linux-kernel

The subject is entirely wrong - this is not a cfg80211 patch.

johannes

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] cfg80211: drop unlikely behind WARN_ON()
  2015-10-05  6:52 ` Johannes Berg
@ 2015-10-05 11:23   ` Kalle Valo
  2015-10-05 12:46     ` [PATCH v2] ath6kl: " Geliang Tang
  0 siblings, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2015-10-05 11:23 UTC (permalink / raw)
  To: Johannes Berg; +Cc: Geliang Tang, linux-wireless, netdev, linux-kernel

Johannes Berg <johannes@sipsolutions.net> writes:

> The subject is entirely wrong - this is not a cfg80211 patch.

Yes, please use prefix "ath6kl: ".

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] ath6kl: drop unlikely behind WARN_ON()
  2015-10-05 11:23   ` Kalle Valo
@ 2015-10-05 12:46     ` Geliang Tang
  2015-10-09  8:49       ` Kalle Valo
  0 siblings, 1 reply; 5+ messages in thread
From: Geliang Tang @ 2015-10-05 12:46 UTC (permalink / raw)
  To: Kalle Valo; +Cc: Geliang Tang, linux-wireless, netdev, linux-kernel

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] ath6kl: drop unlikely behind WARN_ON()
  2015-10-05 12:46     ` [PATCH v2] ath6kl: " Geliang Tang
@ 2015-10-09  8:49       ` Kalle Valo
  0 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2015-10-09  8:49 UTC (permalink / raw)
  To: Geliang Tang; +Cc: linux-wireless, netdev, linux-kernel

Geliang Tang <geliangtang@163.com> writes:

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

Applied, thanks.

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-10-09  8:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-04  7:09 [PATCH] cfg80211: drop unlikely behind WARN_ON() Geliang Tang
2015-10-05  6:52 ` Johannes Berg
2015-10-05 11:23   ` Kalle Valo
2015-10-05 12:46     ` [PATCH v2] ath6kl: " Geliang Tang
2015-10-09  8:49       ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).