Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Eric Van Hensbergen <[email protected]> To: Latchesar Ionkov <[email protected]> To: Dominique Martinet <[email protected]> To: Christian Schoenebeck <[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]> --- include/net/9p/client.h | 2 +- net/9p/trans_rdma.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 838a94218b593f3fb19e6827c472753380193461..4bde6bd716f323c819745e64c7aac0dea7beb72f 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -364,7 +364,7 @@ static inline struct p9_fid *p9_fid_get(struct p9_fid *fid) static inline int p9_fid_put(struct p9_fid *fid) { - if (!fid || IS_ERR(fid)) + if (IS_ERR_OR_NULL(fid)) return 0; if (tracepoint_enabled(9p_fid_ref)) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index aa5bd74d333f3b5e6fd1e4344d26bc0201ff7f7f..60461344b536bcb6e94112aace75a88b6a99ad86 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -252,16 +252,16 @@ static void rdma_destroy_trans(struct p9_trans_rdma *rdma) if (!rdma) return; - if (rdma->qp && !IS_ERR(rdma->qp)) + if (!IS_ERR_OR_NULL(rdma->qp)) ib_destroy_qp(rdma->qp); - if (rdma->pd && !IS_ERR(rdma->pd)) + if (!IS_ERR_OR_NULL(rdma->pd)) ib_dealloc_pd(rdma->pd); - if (rdma->cq && !IS_ERR(rdma->cq)) + if (!IS_ERR_OR_NULL(rdma->cq)) ib_free_cq(rdma->cq); - if (rdma->cm_id && !IS_ERR(rdma->cm_id)) + if (!IS_ERR_OR_NULL(rdma->cm_id)) rdma_destroy_id(rdma->cm_id); kfree(rdma); -- 2.43.0
