From: Igor Stoppa <igor.stoppa@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: igor.stoppa@gmail.com, Igor Stoppa <igor.stoppa@huawei.com>,
Larry Finger <Larry.Finger@lwfinger.net>,
Kalle Valo <kvalo@codeaurora.org>
Subject: [PATCH 12/23] wireless: remove unnecessary unlikely()
Date: Fri, 31 Aug 2018 01:34:18 +0300 [thread overview]
Message-ID: <20180830223429.30051-13-igor.stoppa@huawei.com> (raw)
In-Reply-To: <20180830223429.30051-1-igor.stoppa@huawei.com>
WARN_ON() already contains an unlikely(), so it's not necessary to
wrap it into another.
Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/broadcom/b43/dma.c | 2 +-
drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c
index 6b0e1ec346cb..d113bd997f4b 100644
--- 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 2f0c64cef65f..1b1da7d83652 100644
--- 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");
--
2.17.1
next prev parent reply other threads:[~2018-08-30 22:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180830223429.30051-1-igor.stoppa@huawei.com>
2018-08-30 22:34 ` [PATCH 01/23] infiniband: nes: add unlikely() to assert() Igor Stoppa
2018-08-31 14:06 ` Doug Ledford
2018-08-30 22:34 ` [PATCH 02/23] ethernet: hnae: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 03/23] asm-generic: bug: add unlikely() to BUG_ON() Igor Stoppa
2018-08-30 22:34 ` [PATCH 04/23] mips: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 05/23] selftest: vm: " Igor Stoppa
2018-08-30 22:57 ` Dmitry Safonov
2018-08-30 23:04 ` Dmitry Safonov
2018-08-31 21:25 ` Igor Stoppa
2018-08-30 22:34 ` [PATCH 06/23] virtio: add unlikely() to WARN_ON_ONCE() Igor Stoppa
2018-08-30 22:34 ` [PATCH 07/23] seccomp: remove unnecessary unlikely() Igor Stoppa
2018-09-02 21:26 ` Kees Cook
2018-08-30 22:34 ` [PATCH 08/23] drm: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 09/23] cpufreq: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 10/23] wireless: " Igor Stoppa
2018-08-31 9:52 ` Kalle Valo
2018-08-31 13:44 ` Igor Stoppa
2018-08-30 22:34 ` [PATCH 11/23] " Igor Stoppa
2018-08-30 22:34 ` Igor Stoppa [this message]
2018-08-30 22:34 ` [PATCH 13/23] freescale: ethernet: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 14/23] wimax: i2400m: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 15/23] lvm: device mapper: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 16/23] " Igor Stoppa
2018-08-30 22:34 ` [PATCH 17/23] usb: octeon-hcd: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 18/23] infiniband: scsi: " Igor Stoppa
2018-08-30 22:53 ` Bart Van Assche
2018-08-30 22:34 ` [PATCH 19/23] pinctrl: " Igor Stoppa
2018-08-31 9:29 ` Linus Walleij
2018-08-30 22:34 ` [PATCH 20/23] mm: percpu: " Igor Stoppa
2018-08-31 1:58 ` Dennis Zhou
2018-08-30 22:34 ` [PATCH 21/23] filesystems: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 22/23] powerpc: " Igor Stoppa
2018-08-30 22:34 ` [PATCH 23/23] scsi: " Igor Stoppa
2018-08-31 14:09 ` [PATCH 00/23] Make use of unlikely() more consistently Arnd Bergmann
2018-08-31 20:35 ` Igor Stoppa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180830223429.30051-13-igor.stoppa@huawei.com \
--to=igor.stoppa@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=igor.stoppa@huawei.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®