vfio/mdev: Remove CONFIG_VFIO_MDEV_DEVICE

[linux-2.6-microblaze.git] / drivers / vfio / mdev / mdev_core.c

diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c
index 2a85d6f..ff8c1a8 100644 (file)
--- a/drivers/vfio/mdev/mdev_core.c
+++ b/drivers/vfio/mdev/mdev_core.c
@@ -360,11 +360,24 @@ int mdev_device_remove(struct mdev_device *mdev)
 
 static int __init mdev_init(void)
 {
-       return mdev_bus_register();
+       int rc;
+
+       rc = mdev_bus_register();
+       if (rc)
+               return rc;
+       rc = mdev_register_driver(&vfio_mdev_driver);
+       if (rc)
+               goto err_bus;
+       return 0;
+err_bus:
+       mdev_bus_unregister();
+       return rc;
 }
 
 static void __exit mdev_exit(void)
 {
+       mdev_unregister_driver(&vfio_mdev_driver);
+
        if (mdev_bus_compat_class)
                class_compat_unregister(mdev_bus_compat_class);
 
@@ -378,4 +391,3 @@ MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_SOFTDEP("post: vfio_mdev");