Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Trond Myklebust <[email protected]> To: Anna Schumaker <[email protected]> To: Chuck Lever <[email protected]> To: Jeff Layton <[email protected]> To: NeilBrown <[email protected]> To: Olga Kornievskaia <[email protected]> To: Dai Ngo <[email protected]> To: Tom Talpey <[email protected]> To: "David S. Miller" <[email protected]> To: Eric Dumazet <[email protected]> To: Jakub Kicinski <[email protected]> To: Paolo Abeni <[email protected]> To: Simon Horman <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 9b623849723ed0eb74b827881c6f32d3434c891b..b4d03e59a8202f20360cff1e2e79b1e325396517 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -578,7 +578,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) errout: /* Take a reference in case the DTO handler runs */ svc_xprt_get(&newxprt->sc_xprt); - if (newxprt->sc_qp && !IS_ERR(newxprt->sc_qp)) + if (!IS_ERR_OR_NULL(newxprt->sc_qp)) ib_destroy_qp(newxprt->sc_qp); rdma_destroy_id(newxprt->sc_cm_id); rpcrdma_rn_unregister(dev, &newxprt->sc_rn); @@ -608,7 +608,7 @@ static void svc_rdma_free(struct svc_xprt *xprt) might_sleep(); /* This blocks until the Completion Queues are empty */ - if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) + if (!IS_ERR_OR_NULL(rdma->sc_qp)) ib_drain_qp(rdma->sc_qp); flush_workqueue(svcrdma_wq); @@ -619,16 +619,16 @@ static void svc_rdma_free(struct svc_xprt *xprt) svc_rdma_recv_ctxts_destroy(rdma); /* Destroy the QP if present (not a listener) */ - if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) + if (!IS_ERR_OR_NULL(rdma->sc_qp)) ib_destroy_qp(rdma->sc_qp); - if (rdma->sc_sq_cq && !IS_ERR(rdma->sc_sq_cq)) + if (!IS_ERR_OR_NULL(rdma->sc_sq_cq)) ib_free_cq(rdma->sc_sq_cq); - if (rdma->sc_rq_cq && !IS_ERR(rdma->sc_rq_cq)) + if (!IS_ERR_OR_NULL(rdma->sc_rq_cq)) ib_free_cq(rdma->sc_rq_cq); - if (rdma->sc_pd && !IS_ERR(rdma->sc_pd)) + if (!IS_ERR_OR_NULL(rdma->sc_pd)) ib_dealloc_pd(rdma->sc_pd); /* Destroy the CM ID */ -- 2.43.0
