Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / samples / vfio-mdev / mbochs.c

diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index 0f15118..c313ab4 100644 (file)
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -1278,12 +1278,7 @@ static long mbochs_ioctl(struct vfio_device *vdev, unsigned int cmd,
        return -ENOTTY;
 }
 
-static int mbochs_open(struct vfio_device *vdev)
-{
-       return 0;
-}
-
-static void mbochs_close(struct vfio_device *vdev)
+static void mbochs_close_device(struct vfio_device *vdev)
 {
        struct mdev_state *mdev_state =
                container_of(vdev, struct mdev_state, vdev);
@@ -1401,8 +1396,7 @@ static struct attribute_group *mdev_type_groups[] = {
 };
 
 static const struct vfio_device_ops mbochs_dev_ops = {
-       .open = mbochs_open,
-       .release = mbochs_close,
+       .close_device = mbochs_close_device,
        .read = mbochs_read,
        .write = mbochs_write,
        .ioctl = mbochs_ioctl,