diff options
author | Denis Efremov <efremov@linux.com> | 2019-09-25 19:49:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-26 13:10:30 -0400 |
commit | 77c0e745bd11fc1ccc4690409eca92ea07200141 (patch) | |
tree | 1e08c0319049622e7c9a4dcc0e5b0f4d2068c03e | |
parent | 7159d54418e0a1a3df91e74501363a1c05379517 (diff) |
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>
-rw-r--r-- | drivers/net/wimax/i2400m/tx.c | 3 |
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) | |||
654 | padding = aligned_size - tx_msg_moved->size; | 654 | padding = aligned_size - tx_msg_moved->size; |
655 | if (padding > 0) { | 655 | if (padding > 0) { |
656 | pad_buf = i2400m_tx_fifo_push(i2400m, padding, 0, 0); | 656 | pad_buf = i2400m_tx_fifo_push(i2400m, padding, 0, 0); |
657 | if (unlikely(WARN_ON(pad_buf == NULL | 657 | if (WARN_ON(pad_buf == NULL || pad_buf == TAIL_FULL)) { |
658 | || pad_buf == TAIL_FULL))) { | ||
659 | /* This should not happen -- append should verify | 658 | /* This should not happen -- append should verify |
660 | * there is always space left at least to append | 659 | * there is always space left at least to append |
661 | * tx_block_size */ | 660 | * tx_block_size */ |