RDMA/bnxt_re: Use IS_ERR_OR_NULL where appropriate

Constructs such as if (ptr && !IS_ERR(ptr)) can be shorted to
just !IS_ERR_OR_NULL(ptr) instead.  Make substitutions in the bnxt_re
driver where appropriate.

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index 17aa087cdb6ff4128e9564d4e2abc696565f46e3..17741146968640afc7a38ccf7f7d4ed241e2c046 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -692,9 +692,9 @@ int bnxt_re_destroy_qp(struct ib_qp *ib_qp)
                kfree(rdev->qp1_sqp);
        }
 
-       if (qp->rumem && !IS_ERR(qp->rumem))
+       if (!IS_ERR_OR_NULL(qp->rumem))
                ib_umem_release(qp->rumem);
-       if (qp->sumem && !IS_ERR(qp->sumem))
+       if (!IS_ERR_OR_NULL(qp->sumem))
                ib_umem_release(qp->sumem);
 
        mutex_lock(&rdev->qp_lock);
@@ -2116,7 +2116,7 @@ int bnxt_re_destroy_cq(struct ib_cq *ib_cq)
                dev_err(rdev_to_dev(rdev), "Failed to destroy HW CQ");
                return rc;
        }
-       if (cq->umem && !IS_ERR(cq->umem))
+       if (!IS_ERR_OR_NULL(cq->umem))
                ib_umem_release(cq->umem);
 
        if (cq) {
@@ -2829,7 +2829,7 @@ int bnxt_re_dereg_mr(struct ib_mr *ib_mr)
        }
        rc = bnxt_qplib_free_mrw(&rdev->qplib_res, &mr->qplib_mr);
 
-       if (!IS_ERR(mr->ib_umem) && mr->ib_umem)
+       if (!IS_ERR_OR_NULL(mr->ib_umem))
                ib_umem_release(mr->ib_umem);
 
        kfree(mr);