drm/vboxvideo: Replace module-init boiler-plate code with DRM helpers
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 17 Dec 2021 14:46:14 +0000 (15:46 +0100)
committerJavier Martinez Canillas <javierm@redhat.com>
Thu, 27 Jan 2022 18:15:34 +0000 (19:15 +0100)
Remove custom vbox_init() and vbox_exit() functions and initialize
the module with DRM module helpers.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211217144615.32733-10-tzimmermann@suse.de
drivers/gpu/drm/vboxvideo/vbox_drv.c

index f35d9e4..f4f2bd7 100644 (file)
@@ -18,6 +18,7 @@
 #include <drm/drm_file.h>
 #include <drm/drm_ioctl.h>
 #include <drm/drm_managed.h>
+#include <drm/drm_module.h>
 
 #include "vbox_drv.h"
 
@@ -190,24 +191,7 @@ static const struct drm_driver driver = {
        DRM_GEM_VRAM_DRIVER,
 };
 
-static int __init vbox_init(void)
-{
-       if (drm_firmware_drivers_only() && vbox_modeset == -1)
-               return -EINVAL;
-
-       if (vbox_modeset == 0)
-               return -EINVAL;
-
-       return pci_register_driver(&vbox_pci_driver);
-}
-
-static void __exit vbox_exit(void)
-{
-       pci_unregister_driver(&vbox_pci_driver);
-}
-
-module_init(vbox_init);
-module_exit(vbox_exit);
+drm_module_pci_driver_if_modeset(vbox_pci_driver, vbox_modeset);
 
 MODULE_AUTHOR("Oracle Corporation");
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");