summaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-09-25 16:49:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 10:10:30 -0700
commit77c0e745bd11fc1ccc4690409eca92ea07200141 (patch)
tree1e08c0319049622e7c9a4dcc0e5b0f4d2068c03e /drivers/net/wimax
parent7159d54418e0a1a3df91e74501363a1c05379517 (diff)
downloadlinux-stable-77c0e745bd11fc1ccc4690409eca92ea07200141.tar.gz
linux-stable-77c0e745bd11fc1ccc4690409eca92ea07200141.tar.bz2
linux-stable-77c0e745bd11fc1ccc4690409eca92ea07200141.zip
wimax/i2400m: remove unlikely() from WARN*() condition
"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely() internally. Link: http://lkml.kernel.org/r/20190829165025.15750-6-efremov@linux.com Signed-off-by: Denis Efremov <efremov@linux.com> Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r--drivers/net/wimax/i2400m/tx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index ebd64e083726..1255302e251e 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -654,8 +654,7 @@ void i2400m_tx_close(struct i2400m *i2400m)
padding = aligned_size - tx_msg_moved->size;
if (padding > 0) {
pad_buf = i2400m_tx_fifo_push(i2400m, padding, 0, 0);
- if (unlikely(WARN_ON(pad_buf == NULL
- || pad_buf == TAIL_FULL))) {
+ if (WARN_ON(pad_buf == NULL || pad_buf == TAIL_FULL)) {
/* This should not happen -- append should verify
* there is always space left at least to append
* tx_block_size */