Merge drm/drm-next into drm-intel-next-queued

[linux-block.git] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 242f59910c1901454d9430c29134f407edbcc80e..8594a8ef08ce9ddef07038ff81f6c4c656512973 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1898,7 +1898,7 @@ static const struct i915_debugfs_files {
 #endif
 };
 
-int i915_debugfs_register(struct drm_i915_private *dev_priv)
+void i915_debugfs_register(struct drm_i915_private *dev_priv)
 {
        struct drm_minor *minor = dev_priv->drm.primary;
        int i;
@@ -1915,7 +1915,7 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv)
                                    i915_debugfs_files[i].fops);
        }
 
-       return drm_debugfs_create_files(i915_debugfs_list,
-                                       I915_DEBUGFS_ENTRIES,
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(i915_debugfs_list,
+                                I915_DEBUGFS_ENTRIES,
+                                minor->debugfs_root, minor);
 }