OSDN Git Service

drm/nouveau: make nouveau_drm_debugfs_init() return 0
authorWambui Karuga <wambui.karugax@gmail.com>
Tue, 10 Mar 2020 13:31:15 +0000 (16:31 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 Mar 2020 15:26:58 +0000 (16:26 +0100)
Since 987d65d01356 (drm: debugfs: make
drm_debugfs_create_files() never fail), there is no need to ever check
for the the return value of debugfs_create_file() and
drm_debugfs_create_files(). Therefore, remove unnecessary checks and
error handling in nouveau_drm_debugfs_init() and have the function
return 0 directly.

v2: have nouveau_drm_debugfs_init() return 0 instead of void so as not
to introduce any build warnings to enable individual patch compilation.

References: https://lists.freedesktop.org/archives/dri-devel/2020-February/257183.html
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310133121.27913-12-wambui.karugax@gmail.com
drivers/gpu/drm/nouveau/nouveau_debugfs.c

index 7dfbbbc..15a3d40 100644 (file)
@@ -222,22 +222,18 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)
 {
        struct nouveau_drm *drm = nouveau_drm(minor->dev);
        struct dentry *dentry;
-       int i, ret;
+       int i;
 
        for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) {
-               dentry = debugfs_create_file(nouveau_debugfs_files[i].name,
-                                            S_IRUGO | S_IWUSR,
-                                            minor->debugfs_root, minor->dev,
-                                            nouveau_debugfs_files[i].fops);
-               if (!dentry)
-                       return -ENOMEM;
+               debugfs_create_file(nouveau_debugfs_files[i].name,
+                                   S_IRUGO | S_IWUSR,
+                                   minor->debugfs_root, minor->dev,
+                                   nouveau_debugfs_files[i].fops);
        }
 
-       ret = drm_debugfs_create_files(nouveau_debugfs_list,
-                                      NOUVEAU_DEBUGFS_ENTRIES,
-                                      minor->debugfs_root, minor);
-       if (ret)
-               return ret;
+       drm_debugfs_create_files(nouveau_debugfs_list,
+                                NOUVEAU_DEBUGFS_ENTRIES,
+                                minor->debugfs_root, minor);
 
        /* Set the size of the vbios since we know it, and it's confusing to
         * userspace if it wants to seek() but the file has a length of 0