diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2017-02-08 21:13:25 +0100 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2017-02-08 21:13:25 +0100 |
| commit | f790eb57e6ec8d77489755cc25a51c4409e2f590 (patch) | |
| tree | e706eac9cdc51a8fd59dcffc082860fe27c14781 /drivers/vfio | |
| parent | vfio: Fix build break when SPAPR_TCE_IOMMU=n (diff) | |
| download | linux-f790eb57e6ec8d77489755cc25a51c4409e2f590.tar.xz linux-f790eb57e6ec8d77489755cc25a51c4409e2f590.zip | |
vfio/mdev: Use a module softdep for vfio_mdev
Use an explicit module softdep rather than a request module call such
that the dependency is exposed to userspace. This allows us to more
easily support modules loaded at initrd time.
Reviewed by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/mdev/mdev_core.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c index 36d75c367d22..126991046eb7 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -422,18 +422,7 @@ int mdev_device_remove(struct device *dev, bool force_remove) static int __init mdev_init(void) { - int ret; - - ret = mdev_bus_register(); - - /* - * Attempt to load known vfio_mdev. This gives us a working environment - * without the user needing to explicitly load vfio_mdev driver. - */ - if (!ret) - request_module_nowait("vfio_mdev"); - - return ret; + return mdev_bus_register(); } static void __exit mdev_exit(void) @@ -451,3 +440,4 @@ MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_SOFTDEP("post: vfio_mdev"); |