drm/i915: stop registering if drm_dev_register() fails

If drm_dev_register() fails there is no reason to continue registering
the driver and initializing.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210213042756.953007-1-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 57d693e..67e4d91 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -664,17 +664,19 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
        intel_vgpu_register(dev_priv);
 
        /* Reveal our presence to userspace */
-       if (drm_dev_register(dev, 0) == 0) {
-               i915_debugfs_register(dev_priv);
-               if (HAS_DISPLAY(dev_priv))
-                       intel_display_debugfs_register(dev_priv);
-               i915_setup_sysfs(dev_priv);
-
-               /* Depends on sysfs having been initialized */
-               i915_perf_register(dev_priv);
-       } else
+       if (drm_dev_register(dev, 0)) {
                drm_err(&dev_priv->drm,
                        "Failed to register driver for userspace access!\n");
+               return;
+       }
+
+       i915_debugfs_register(dev_priv);
+       if (HAS_DISPLAY(dev_priv))
+               intel_display_debugfs_register(dev_priv);
+       i915_setup_sysfs(dev_priv);
+
+       /* Depends on sysfs having been initialized */
+       i915_perf_register(dev_priv);
 
        if (HAS_DISPLAY(dev_priv)) {
                /* Must be done after probing outputs */