[Intel-wired-lan] [PATCH 24/61] net/9p: Prefer IS_ERR_OR_NULL over manual NULL check

[Loktionov, Aleksandr]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf
> Of Philipp Hahn
> Sent: Tuesday, March 10, 2026 12:49 PM
> To: amd-gfx at lists.freedesktop.org; apparmor at lists.ubuntu.com;
> bpf at vger.kernel.org; ceph-devel at vger.kernel.org; cocci at inria.fr; dm-
> devel at lists.linux.dev; dri-devel at lists.freedesktop.org;
> gfs2 at lists.linux.dev; intel-gfx at lists.freedesktop.org; intel-wired-
> lan at lists.osuosl.org; iommu at lists.linux.dev; kvm at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org; linux-block at vger.kernel.org;
> linux-bluetooth at vger.kernel.org; linux-btrfs at vger.kernel.org; linux-
> cifs at vger.kernel.org; linux-clk at vger.kernel.org; linux-
> erofs at lists.ozlabs.org; linux-ext4 at vger.kernel.org; linux-
> fsdevel at vger.kernel.org; linux-gpio at vger.kernel.org; linux-
> hyperv at vger.kernel.org; linux-input at vger.kernel.org; linux-
> kernel at vger.kernel.org; linux-leds at vger.kernel.org; linux-
> media at vger.kernel.org; linux-mips at vger.kernel.org; linux-mm at kvack.org;
> linux-modules at vger.kernel.org; linux-mtd at lists.infradead.org; linux-
> nfs at vger.kernel.org; linux-omap at vger.kernel.org; linux-
> phy at lists.infradead.org; linux-pm at vger.kernel.org; linux-
> rockchip at lists.infradead.org; linux-s390 at vger.kernel.org; linux-
> scsi at vger.kernel.org; linux-sctp at vger.kernel.org; linux-security-
> module at vger.kernel.org; linux-sh at vger.kernel.org; linux-
> sound at vger.kernel.org; linux-stm32 at st-md-mailman.stormreply.com;
> linux-trace-kernel at vger.kernel.org; linux-usb at vger.kernel.org; linux-
> wireless at vger.kernel.org; netdev at vger.kernel.org;
> ntfs3 at lists.linux.dev; samba-technical at lists.samba.org; sched-
> ext at lists.linux.dev; target-devel at vger.kernel.org; tipc-
> discussion at lists.sourceforge.net; v9fs at lists.linux.dev; Philipp Hahn
> <phahn-oss at avm.de>
> Cc: Eric Van Hensbergen <ericvh at kernel.org>; Latchesar Ionkov
> <lucho at ionkov.net>; Dominique Martinet <asmadeus at codewreck.org>;
> Christian Schoenebeck <linux_oss at crudebyte.com>; David S. Miller
> <davem at davemloft.net>; Eric Dumazet <edumazet at google.com>; Jakub
> Kicinski <kuba at kernel.org>; Paolo Abeni <pabeni at redhat.com>; Simon
> Horman <horms at kernel.org>
> Subject: [Intel-wired-lan] [PATCH 24/61] net/9p: Prefer IS_ERR_OR_NULL
> over manual NULL check
> 
> Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL
> check.
> 
> Change generated with coccinelle.
> 
> To: Eric Van Hensbergen <ericvh at kernel.org>
> To: Latchesar Ionkov <lucho at ionkov.net>
> To: Dominique Martinet <asmadeus at codewreck.org>
> To: Christian Schoenebeck <linux_oss at crudebyte.com>
> To: "David S. Miller" <davem at davemloft.net>
> To: Eric Dumazet <edumazet at google.com>
> To: Jakub Kicinski <kuba at kernel.org>
> To: Paolo Abeni <pabeni at redhat.com>
> To: Simon Horman <horms at kernel.org>
> Cc: v9fs at lists.linux.dev
> Cc: netdev at vger.kernel.org
> Cc: linux-kernel at vger.kernel.org
> Signed-off-by: Philipp Hahn <phahn-oss at avm.de>
> ---
>  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..4bde6bd716f323c819745e64c7aa
> c0dea7beb72f 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..60461344b536bcb6e94112aace75
> a88b6a99ad86 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

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov at intel.com>