On Tue, 10 Mar 2026 12:49:12 +0100 Philipp Hahn <[email protected]> wrote:
> Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL > check. > > Change generated with coccinelle. > > To: Alex Williamson <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Philipp Hahn <[email protected]> > --- > 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
