Re: [PATCH 46/61] vfio: Prefer IS_ERR_OR_NULL over manual NULL check
On Tue, 10 Mar 2026 12:49:12 +0100 Philipp Hahn wrote: > Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL > check. > > Change generated with coccinelle. > > To: Alex Williamson > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Philipp Hahn > --- > drivers/vfio/vfio_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c > index > 742477546b15d4dbaf9ebcfb2e67627db71521e0..d71922dfde5885967398deddec3e9e04b05adfec > 100644 > --- a/drivers/vfio/vfio_main.c > +++ b/drivers/vfio/vfio_main.c > @@ -923,7 +923,7 @@ vfio_ioctl_device_feature_mig_device_state(struct > vfio_device *device, > > /* Handle the VFIO_DEVICE_FEATURE_SET */ > filp = device->mig_ops->migration_set_state(device, mig.device_state); > - if (IS_ERR(filp) || !filp) > + if (IS_ERR_OR_NULL(filp)) > goto out_copy; > > return vfio_ioct_mig_return_fd(filp, arg, &mig); > As others have expressed in general, this doesn't seem to be cleaner and tends to mask that we consider IS_ERR() and NULL as separate cases in the goto. This code looks like it could use some refactoring, and likely that refactoring should handle the IS_ERR() and NULL cases separately, but conflating them here is not an improvement. Thanks, Alex
RE: [Intel-wired-lan] [PATCH 46/61] vfio: Prefer IS_ERR_OR_NULL over manual NULL check
> -Original Message- > From: Intel-wired-lan On Behalf > Of Philipp Hahn > Sent: Tuesday, March 10, 2026 12:49 PM > To: [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; dm- > [email protected]; [email protected]; > [email protected]; [email protected]; intel-wired- > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux-security- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; > [email protected]; [email protected]; sched- > [email protected]; [email protected]; tipc- > [email protected]; [email protected]; Philipp Hahn > > Cc: Alex Williamson > Subject: [Intel-wired-lan] [PATCH 46/61] vfio: 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: Alex Williamson > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Philipp Hahn > --- > drivers/vfio/vfio_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index > 742477546b15d4dbaf9ebcfb2e67627db71521e0..d71922dfde5885967398deddec3e > 9e04b05adfec 100644 > --- a/drivers/vfio/vfio_main.c > +++ b/drivers/vfio/vfio_main.c > @@ -923,7 +923,7 @@ vfio_ioctl_device_feature_mig_device_state(struct > vfio_device *device, > > /* Handle the VFIO_DEVICE_FEATURE_SET */ > filp = device->mig_ops->migration_set_state(device, > mig.device_state); > - if (IS_ERR(filp) || !filp) > + if (IS_ERR_OR_NULL(filp)) > goto out_copy; > > return vfio_ioct_mig_return_fd(filp, arg, &mig); > > -- > 2.43.0 Reviewed-by: Aleksandr Loktionov
Re: [PATCH 46/61] vfio: Prefer IS_ERR_OR_NULL over manual NULL check
On Tue, Mar 10, 2026 at 12:49:12PM +0100, Philipp Hahn wrote: > Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL > check. > > Change generated with coccinelle. > > To: Alex Williamson > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Philipp Hahn > --- > drivers/vfio/vfio_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c > index > 742477546b15d4dbaf9ebcfb2e67627db71521e0..d71922dfde5885967398deddec3e9e04b05adfec > 100644 > --- a/drivers/vfio/vfio_main.c > +++ b/drivers/vfio/vfio_main.c > @@ -923,7 +923,7 @@ vfio_ioctl_device_feature_mig_device_state(struct > vfio_device *device, > > /* Handle the VFIO_DEVICE_FEATURE_SET */ > filp = device->mig_ops->migration_set_state(device, mig.device_state); > - if (IS_ERR(filp) || !filp) > + if (IS_ERR_OR_NULL(filp)) > goto out_copy; > > return vfio_ioct_mig_return_fd(filp, arg, &mig); > Reviewed-by: Pranjal Shrivastava The cleanup alone looks fine, but I'm not sure if the maintainers would be happy about the tree-wide spam, since each patch might go through a different tree. I'd wait for Alex's preference/ack on that. Thanks, Praan
[PATCH 46/61] vfio: 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: Alex Williamson Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn --- drivers/vfio/vfio_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 742477546b15d4dbaf9ebcfb2e67627db71521e0..d71922dfde5885967398deddec3e9e04b05adfec 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -923,7 +923,7 @@ vfio_ioctl_device_feature_mig_device_state(struct vfio_device *device, /* Handle the VFIO_DEVICE_FEATURE_SET */ filp = device->mig_ops->migration_set_state(device, mig.device_state); - if (IS_ERR(filp) || !filp) + if (IS_ERR_OR_NULL(filp)) goto out_copy; return vfio_ioct_mig_return_fd(filp, arg, &mig); -- 2.43.0
