Commit 0567776b authored by Wambui Karuga's avatar Wambui Karuga Committed by Daniel Vetter

drm/nouveau: make nouveau_drm_debugfs_init() return 0

Since 987d65d0 (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.htmlSigned-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310133121.27913-12-wambui.karugax@gmail.com
parent 3a748157
...@@ -222,22 +222,18 @@ nouveau_drm_debugfs_init(struct drm_minor *minor) ...@@ -222,22 +222,18 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)
{ {
struct nouveau_drm *drm = nouveau_drm(minor->dev); struct nouveau_drm *drm = nouveau_drm(minor->dev);
struct dentry *dentry; struct dentry *dentry;
int i, ret; int i;
for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) { for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) {
dentry = debugfs_create_file(nouveau_debugfs_files[i].name, debugfs_create_file(nouveau_debugfs_files[i].name,
S_IRUGO | S_IWUSR, S_IRUGO | S_IWUSR,
minor->debugfs_root, minor->dev, minor->debugfs_root, minor->dev,
nouveau_debugfs_files[i].fops); nouveau_debugfs_files[i].fops);
if (!dentry)
return -ENOMEM;
} }
ret = drm_debugfs_create_files(nouveau_debugfs_list, drm_debugfs_create_files(nouveau_debugfs_list,
NOUVEAU_DEBUGFS_ENTRIES, NOUVEAU_DEBUGFS_ENTRIES,
minor->debugfs_root, minor); minor->debugfs_root, minor);
if (ret)
return ret;
/* Set the size of the vbios since we know it, and it's confusing to /* 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 * userspace if it wants to seek() but the file has a length of 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment