From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Stoppa Subject: [PATCH] wimax: i2400m: remove unnecessary unlikely() Date: Fri, 7 Sep 2018 20:22:03 +0300 Message-ID: <20180907172203.28668-1-igor.stoppa@huawei.com> Cc: igor.stoppa@gmail.com, Igor Stoppa , linux-wimax@intel.com, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: Inaky Perez-Gonzalez Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org WARN_ON() already contains an unlikely(), so it's not necessary to wrap it into another. Signed-off-by: Igor Stoppa Cc: Inaky Perez-Gonzalez Cc: linux-wimax@intel.com Cc: "David S. Miller" Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/net/wimax/i2400m/tx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c index f20886ade1cc..59c70d928249 100644 --- a/drivers/net/wimax/i2400m/tx.c +++ b/drivers/net/wimax/i2400m/tx.c @@ -655,8 +655,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 || pad_buf == TAIL_FULL)) { /* This should not happen -- append should verify * there is always space left at least to append * tx_block_size */ -- 2.17.1