[Intel-gfx] [PATCH v2 01/14] vfio/samples: Remove module get/put

Jason Gunthorpe
2021-07-20T17:43:15Z

The patch to move the get/put to core and the patch to convert the samples
to use vfio_device crossed in a way that this was missed. When both
patches are together the samples do not need their own get/put.

Fixes: 437e41368c01 ("vfio/mdpy: Convert to use vfio_register_group_dev()")
Fixes: 681c1615f891 ("vfio/mbochs: Convert to use vfio_register_group_dev()")
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
samples/vfio-mdev/mbochs.c | 4 ----
samples/vfio-mdev/mdpy.c | 4 ----
2 files changed, 8 deletions(-)

diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index 6c0f229db36a1a..e81b875b4d87b4 100644
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -1274,9 +1274,6 @@ static long mbochs_ioctl(struct vfio_device *vdev, unsigned int cmd,

static int mbochs_open(struct vfio_device *vdev)
{
- if (!try_module_get(THIS_MODULE))
- return -ENODEV;
-
return 0;
}

@@ -1300,7 +1297,6 @@ static void mbochs_close(struct vfio_device *vdev)
mbochs_put_pages(mdev_state);

mutex_unlock(&mdev_state->ops_lock);
- module_put(THIS_MODULE);
}

static ssize_t
diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c
index 393c9df6f6a010..a7d4ed28d66411 100644
--- a/samples/vfio-mdev/mdpy.c
+++ b/samples/vfio-mdev/mdpy.c
@@ -611,15 +611,11 @@ static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd,

static int mdpy_open(struct vfio_device *vdev)
{
- if (!try_module_get(THIS_MODULE))
- return -ENODEV;
-
return 0;
}

static void mdpy_close(struct vfio_device *vdev)
{
- module_put(THIS_MODULE);
}

static ssize_t
--
2.32.0