diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-05-23 09:34:47 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-05-23 09:34:47 +0100 |
| commit | 8ec5c0006c50cb1909c0de0fad137909c1218990 (patch) | |
| tree | b5df17cb06943792b3a2c9f3fab8a2c357113b34 /samples/vfio-mdev/mdpy.c | |
| parent | 39921e5f00f5a98ff9cb3229937ca339e8d9c9c6 (diff) | |
| parent | 5f38c3fb55ce3814b4353320d7a205068a420e48 (diff) | |
| download | linux-stable-8ec5c0006c50cb1909c0de0fad137909c1218990.tar.gz linux-stable-8ec5c0006c50cb1909c0de0fad137909c1218990.tar.bz2 linux-stable-8ec5c0006c50cb1909c0de0fad137909c1218990.zip | |
Merge tag 'drm-intel-next-2022-05-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-gt-next
drm/i915 drm-intel-next -> drm-intel-gt-next cross-merge sync
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
# Conflicts:
# drivers/gpu/drm/i915/gt/intel_rps.c
# drivers/gpu/drm/i915/i915_vma.c
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y1ywbh5y.fsf@intel.com
Diffstat (limited to 'samples/vfio-mdev/mdpy.c')
| -rw-r--r-- | samples/vfio-mdev/mdpy.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c index fe5d43e797b6..e8c46eb2e246 100644 --- a/samples/vfio-mdev/mdpy.c +++ b/samples/vfio-mdev/mdpy.c @@ -723,12 +723,7 @@ static struct mdev_driver mdpy_driver = { }, .probe = mdpy_probe, .remove = mdpy_remove, -}; - -static const struct mdev_parent_ops mdev_fops = { - .owner = THIS_MODULE, - .device_driver = &mdpy_driver, - .supported_type_groups = mdev_type_groups, + .supported_type_groups = mdev_type_groups, }; static const struct file_operations vd_fops = { @@ -771,7 +766,7 @@ static int __init mdpy_dev_init(void) if (ret) goto err_class; - ret = mdev_register_device(&mdpy_dev, &mdev_fops); + ret = mdev_register_device(&mdpy_dev, &mdpy_driver); if (ret) goto err_device; |