Commit a212d6a5 authored by Wambui Karuga's avatar Wambui Karuga Committed by Daniel Vetter

drm/debugfs: remove checks for return value of drm_debugfs functions.

Since 987d65d0 (drm: debugfs: make drm_debugfs_create_files() never
fail), there is no need to check the return value of
drm_debugfs_create_files(). Therefore, remove remove unnecessary checks
and error handling statement blocks for its return value.

These changes also enable changing drm_debugfs_create_files() to return
void.
Signed-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-17-wambui.karugax@gmail.com
parent 092c367a
...@@ -172,7 +172,7 @@ static const struct file_operations drm_debugfs_fops = { ...@@ -172,7 +172,7 @@ static const struct file_operations drm_debugfs_fops = {
* &struct drm_info_list in the given root directory. These files will be removed * &struct drm_info_list in the given root directory. These files will be removed
* automatically on drm_debugfs_cleanup(). * automatically on drm_debugfs_cleanup().
*/ */
int drm_debugfs_create_files(const struct drm_info_list *files, int count, void drm_debugfs_create_files(const struct drm_info_list *files, int count,
struct dentry *root, struct drm_minor *minor) struct dentry *root, struct drm_minor *minor)
{ {
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
...@@ -199,7 +199,6 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count, ...@@ -199,7 +199,6 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count,
list_add(&tmp->list, &minor->debugfs_list); list_add(&tmp->list, &minor->debugfs_list);
mutex_unlock(&minor->debugfs_lock); mutex_unlock(&minor->debugfs_lock);
} }
return 0;
} }
EXPORT_SYMBOL(drm_debugfs_create_files); EXPORT_SYMBOL(drm_debugfs_create_files);
...@@ -215,35 +214,17 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id, ...@@ -215,35 +214,17 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
sprintf(name, "%d", minor_id); sprintf(name, "%d", minor_id);
minor->debugfs_root = debugfs_create_dir(name, root); minor->debugfs_root = debugfs_create_dir(name, root);
ret = drm_debugfs_create_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES, drm_debugfs_create_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES,
minor->debugfs_root, minor); minor->debugfs_root, minor);
if (ret) {
debugfs_remove(minor->debugfs_root);
minor->debugfs_root = NULL;
DRM_ERROR("Failed to create core drm debugfs files\n");
return ret;
}
if (drm_drv_uses_atomic_modeset(dev)) { if (drm_drv_uses_atomic_modeset(dev)) {
ret = drm_atomic_debugfs_init(minor); drm_atomic_debugfs_init(minor);
if (ret) {
DRM_ERROR("Failed to create atomic debugfs files\n");
return ret;
}
} }
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = drm_framebuffer_debugfs_init(minor); drm_framebuffer_debugfs_init(minor);
if (ret) {
DRM_ERROR("Failed to create framebuffer debugfs file\n");
return ret;
}
ret = drm_client_debugfs_init(minor); drm_client_debugfs_init(minor);
if (ret) {
DRM_ERROR("Failed to create client debugfs file\n");
return ret;
}
} }
if (dev->driver->debugfs_init) { if (dev->driver->debugfs_init) {
......
...@@ -80,18 +80,16 @@ struct drm_info_node { ...@@ -80,18 +80,16 @@ struct drm_info_node {
}; };
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
int drm_debugfs_create_files(const struct drm_info_list *files, void drm_debugfs_create_files(const struct drm_info_list *files,
int count, struct dentry *root, int count, struct dentry *root,
struct drm_minor *minor); struct drm_minor *minor);
int drm_debugfs_remove_files(const struct drm_info_list *files, int drm_debugfs_remove_files(const struct drm_info_list *files,
int count, struct drm_minor *minor); int count, struct drm_minor *minor);
#else #else
static inline int drm_debugfs_create_files(const struct drm_info_list *files, static inline void drm_debugfs_create_files(const struct drm_info_list *files,
int count, struct dentry *root, int count, struct dentry *root,
struct drm_minor *minor) struct drm_minor *minor)
{ {}
return 0;
}
static inline int drm_debugfs_remove_files(const struct drm_info_list *files, static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
int count, struct drm_minor *minor) int count, struct drm_minor *minor)
......
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