Commit 7b0b6925 authored Sep 25, 2019 by Denis Efremov Committed by Linus Torvalds Sep 26, 2019

IB/hfi1: remove unlikely() from IS_ERR*() condition

"unlikely(IS_ERR_OR_NULL(x))" is excessive. IS_ERR_OR_NULL() already uses
unlikely() internally.

Link: http://lkml.kernel.org/r/20190829165025.15750-8-efremov@linux.com


Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Joe Perches <joe@perches.com>
Acked-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 14ed8688

drivers/infiniband/hw/hfi1/verbs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1041,7 +1041,7 @@ int hfi1_verbs_send_pio(struct rvt_qp qp, struct hfi1_pkt_state ps,
		if (cb)
		iowait_pio_inc(&priv->s_iowait);
		pbuf = sc_buffer_alloc(sc, plen, cb, qp);
		if (unlikely(IS_ERR_OR_NULL(pbuf))) {
		if (IS_ERR_OR_NULL(pbuf)) {
		if (cb)
		verbs_pio_complete(qp, 0);
		if (IS_ERR(pbuf)) {