Skip to content

Commit 7b0b692

Browse files
evdenistorvalds
authored andcommitted
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/[email protected] Signed-off-by: Denis Efremov <[email protected]> Cc: Mike Marciniszyn <[email protected]> Cc: Joe Perches <[email protected]> Acked-by: Dennis Dalessandro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 14ed868 commit 7b0b692

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/infiniband/hw/hfi1/verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
10411041
if (cb)
10421042
iowait_pio_inc(&priv->s_iowait);
10431043
pbuf = sc_buffer_alloc(sc, plen, cb, qp);
1044-
if (unlikely(IS_ERR_OR_NULL(pbuf))) {
1044+
if (IS_ERR_OR_NULL(pbuf)) {
10451045
if (cb)
10461046
verbs_pio_complete(qp, 0);
10471047
if (IS_ERR(pbuf)) {

0 commit comments

Comments
 (0)