| Message ID | YIAowNYCOCNu+xhm@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio/mdev: remove unnecessary NULL check in mbochs_create() | expand |
On Wed, Apr 21, 2021 at 04:29:36PM +0300, Dan Carpenter wrote: > This NULL check is no longer required because "type" now points to > an element in a non-NULL array. > > Fixes: 3d3a360e570616 ("vfio/mbochs: Use mdev_get_type_group_id()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > samples/vfio-mdev/mbochs.c | 2 -- > samples/vfio-mdev/mdpy.c | 3 +-- > 2 files changed, 1 insertion(+), 4 deletions(-) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Thanks, Jason
On Wed, 21 Apr 2021 16:29:36 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote: > This NULL check is no longer required because "type" now points to > an element in a non-NULL array. I think the mdpy change is correct too, but it's hard to verify from this commit log that it was actually intended. Can we note that change as well? Thanks, Alex > > Fixes: 3d3a360e570616 ("vfio/mbochs: Use mdev_get_type_group_id()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > samples/vfio-mdev/mbochs.c | 2 -- > samples/vfio-mdev/mdpy.c | 3 +-- > 2 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c > index 861c76914e76..881ef9a7296f 100644 > --- a/samples/vfio-mdev/mbochs.c > +++ b/samples/vfio-mdev/mbochs.c > @@ -513,8 +513,6 @@ static int mbochs_create(struct mdev_device *mdev) > struct device *dev = mdev_dev(mdev); > struct mdev_state *mdev_state; > > - if (!type) > - type = &mbochs_types[0]; > if (type->mbytes + mbochs_used_mbytes > max_mbytes) > return -ENOMEM; > > diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c > index f0c0e7209719..e889c1cf8fd1 100644 > --- a/samples/vfio-mdev/mdpy.c > +++ b/samples/vfio-mdev/mdpy.c > @@ -667,8 +667,7 @@ static ssize_t description_show(struct mdev_type *mtype, > &mdpy_types[mtype_get_type_group_id(mtype)]; > > return sprintf(buf, "virtual display, %dx%d framebuffer\n", > - type ? type->width : 0, > - type ? type->height : 0); > + type->width, type->height); > } > static MDEV_TYPE_ATTR_RO(description); >
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c index 861c76914e76..881ef9a7296f 100644 --- a/samples/vfio-mdev/mbochs.c +++ b/samples/vfio-mdev/mbochs.c @@ -513,8 +513,6 @@ static int mbochs_create(struct mdev_device *mdev) struct device *dev = mdev_dev(mdev); struct mdev_state *mdev_state; - if (!type) - type = &mbochs_types[0]; if (type->mbytes + mbochs_used_mbytes > max_mbytes) return -ENOMEM; diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c index f0c0e7209719..e889c1cf8fd1 100644 --- a/samples/vfio-mdev/mdpy.c +++ b/samples/vfio-mdev/mdpy.c @@ -667,8 +667,7 @@ static ssize_t description_show(struct mdev_type *mtype, &mdpy_types[mtype_get_type_group_id(mtype)]; return sprintf(buf, "virtual display, %dx%d framebuffer\n", - type ? type->width : 0, - type ? type->height : 0); + type->width, type->height); } static MDEV_TYPE_ATTR_RO(description);
This NULL check is no longer required because "type" now points to an element in a non-NULL array. Fixes: 3d3a360e570616 ("vfio/mbochs: Use mdev_get_type_group_id()") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- samples/vfio-mdev/mbochs.c | 2 -- samples/vfio-mdev/mdpy.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-)