IB/hfi1: remove unlikely() from IS_ERR*() condition
authorDenis Efremov <efremov@linux.com>
Wed, 25 Sep 2019 23:49:40 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Sep 2019 17:10:30 +0000 (10:10 -0700)
"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>
drivers/infiniband/hw/hfi1/verbs.c

index 9f53f63b1453647c053342c1dc37e1e0526a55b7..7bff0a1e713d77535a1ba52de3186b082b1e429e 100644 (file)
@@ -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)) {