Commit 7e41fb50 authored by Igor Stoppa's avatar Igor Stoppa Committed by Kalle Valo
Browse files

wireless: remove unnecessary unlikely() 



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

Signed-off-by: default avatarIgor 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: default avatarKalle Valo <kvalo@codeaurora.org>
parent 514502c3

drivers/net/wireless/ath/ath10k/htt_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/carl9170/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -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),

drivers/net/wireless/broadcom/b43/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/net/wireless/broadcom/b43legacy/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE