wireless: remove unnecessary unlikely()

Both WARN_ON() and WARN_ON_ONCE() already contain unlikely().

Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Michal Kazior <michal.kazior@tieto.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linux Wireless Mailing List <linux-wireless@vger.kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 4d1cd90..1455007 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -1176,11 +1176,11 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,
         */
 
        /* This probably shouldn't happen but warn just in case */
-       if (unlikely(WARN_ON_ONCE(!is_first)))
+       if (WARN_ON_ONCE(!is_first))
                return;
 
        /* This probably shouldn't happen but warn just in case */
-       if (unlikely(WARN_ON_ONCE(!(is_first && is_last))))
+       if (WARN_ON_ONCE(!(is_first && is_last)))
                return;
 
        skb_trim(msdu, msdu->len - FCS_LEN);

diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 0cb5b58..8c75651 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -246,8 +246,8 @@ static void carl9170_release_dev_space(struct ar9170 *ar, struct sk_buff *skb)
         *    of available memory blocks, so the number can
         *    never execeed the mem_blocks count.
         */
-       if (unlikely(WARN_ON_ONCE(cookie == 0) ||
-           WARN_ON_ONCE(cookie > ar->fw.mem_blocks)))
+       if (WARN_ON_ONCE(cookie == 0) ||
+           WARN_ON_ONCE(cookie > ar->fw.mem_blocks))
                return;
 
        atomic_add(DIV_ROUND_UP(skb->len, ar->fw.mem_block_size),

diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c
index 6b0e1ec..d113bd9 100644 (file)
--- a/drivers/net/wireless/broadcom/b43/dma.c
+++ b/drivers/net/wireless/broadcom/b43/dma.c
@@ -1432,7 +1432,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb)
                goto out;
        }
 
-       if (unlikely(WARN_ON(free_slots(ring) < TX_SLOTS_PER_FRAME))) {
+       if (WARN_ON(free_slots(ring) < TX_SLOTS_PER_FRAME)) {
                /* If we get here, we have a real error with the queue
                 * full, but queues not stopped. */
                b43err(dev->wl, "DMA queue overflow\n");

diff --git a/drivers/net/wireless/broadcom/b43legacy/dma.c b/drivers/net/wireless/broadcom/b43legacy/dma.c
index 2f0c64c..1b1da7d 100644 (file)
--- a/drivers/net/wireless/broadcom/b43legacy/dma.c
+++ b/drivers/net/wireless/broadcom/b43legacy/dma.c
@@ -1149,7 +1149,7 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev,
                return -ENOSPC;
        }
 
-       if (unlikely(WARN_ON(free_slots(ring) < SLOTS_PER_PACKET))) {
+       if (WARN_ON(free_slots(ring) < SLOTS_PER_PACKET)) {
                /* If we get here, we have a real error with the queue
                 * full, but queues not stopped. */
                b43legacyerr(dev->wl, "DMA queue overflow\n");