From: Wambui Karuga <wambui.karugax@gmail.com>
To: airlied@linux.ie, daniel@ffwll.ch,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
gregkh@linuxfoundation.org
Subject: [PATCH v2 16/17] drm/debugfs: remove checks for return value of drm_debugfs functions.
Date: Tue, 10 Mar 2020 16:31:20 +0300 [thread overview]
Message-ID: <20200310133121.27913-17-wambui.karugax@gmail.com> (raw)
In-Reply-To: <20200310133121.27913-1-wambui.karugax@gmail.com>
Since 987d65d01356 (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: Wambui Karuga <wambui.karugax@gmail.com>
---
drivers/gpu/drm/drm_debugfs.c | 33 +++++++--------------------------
include/drm/drm_debugfs.h | 16 +++++++---------
2 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 4e673d318503..e13f21642f88 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -172,8 +172,8 @@ static const struct file_operations drm_debugfs_fops = {
* &struct drm_info_list in the given root directory. These files will be removed
* automatically on drm_debugfs_cleanup().
*/
-int drm_debugfs_create_files(const struct drm_info_list *files, int count,
- struct dentry *root, struct drm_minor *minor)
+void drm_debugfs_create_files(const struct drm_info_list *files, int count,
+ struct dentry *root, struct drm_minor *minor)
{
struct drm_device *dev = minor->dev;
struct drm_info_node *tmp;
@@ -199,7 +199,6 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count,
list_add(&tmp->list, &minor->debugfs_list);
mutex_unlock(&minor->debugfs_lock);
}
- return 0;
}
EXPORT_SYMBOL(drm_debugfs_create_files);
@@ -215,35 +214,17 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
sprintf(name, "%d", minor_id);
minor->debugfs_root = debugfs_create_dir(name, root);
- ret = drm_debugfs_create_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES,
- 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;
- }
+ drm_debugfs_create_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES,
+ minor->debugfs_root, minor);
if (drm_drv_uses_atomic_modeset(dev)) {
- ret = drm_atomic_debugfs_init(minor);
- if (ret) {
- DRM_ERROR("Failed to create atomic debugfs files\n");
- return ret;
- }
+ drm_atomic_debugfs_init(minor);
}
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- ret = drm_framebuffer_debugfs_init(minor);
- if (ret) {
- DRM_ERROR("Failed to create framebuffer debugfs file\n");
- return ret;
- }
+ drm_framebuffer_debugfs_init(minor);
- ret = drm_client_debugfs_init(minor);
- if (ret) {
- DRM_ERROR("Failed to create client debugfs file\n");
- return ret;
- }
+ drm_client_debugfs_init(minor);
}
if (dev->driver->debugfs_init) {
diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h
index 7501e323d383..2188dc83957f 100644
--- a/include/drm/drm_debugfs.h
+++ b/include/drm/drm_debugfs.h
@@ -80,18 +80,16 @@ struct drm_info_node {
};
#if defined(CONFIG_DEBUG_FS)
-int drm_debugfs_create_files(const struct drm_info_list *files,
- int count, struct dentry *root,
- struct drm_minor *minor);
+void drm_debugfs_create_files(const struct drm_info_list *files,
+ int count, struct dentry *root,
+ struct drm_minor *minor);
int drm_debugfs_remove_files(const struct drm_info_list *files,
int count, struct drm_minor *minor);
#else
-static inline int drm_debugfs_create_files(const struct drm_info_list *files,
- int count, struct dentry *root,
- struct drm_minor *minor)
-{
- return 0;
-}
+static inline void drm_debugfs_create_files(const struct drm_info_list *files,
+ int count, struct dentry *root,
+ struct drm_minor *minor)
+{}
static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
int count, struct drm_minor *minor)
--
2.25.1
next prev parent reply other threads:[~2020-03-10 13:32 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 13:31 [PATCH v2 00/17] drm: subsytem-wide debugfs functions refactor Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 01/17] drm/tegra: remove checks for debugfs functions return value Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 02/17] drm/tilcdc: remove check for return value of debugfs functions Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 03/17] drm/v3d: make v3d_debugfs_init() return 0 Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 04/17] drm/vc4: remove check of return value of drm_debugfs functions Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 05/17] drm/arc: make arcgpu_debugfs_init() return 0 Wambui Karuga
2020-03-12 7:55 ` Alexey Brodkin
2020-03-10 13:31 ` [PATCH v2 06/17] drm/arm: make hdlcd_debugfs_init() " Wambui Karuga
2020-03-10 15:43 ` Liviu Dudau
2020-03-10 13:31 ` [PATCH v2 07/17] drm/etnaviv: remove check for return value of drm_debugfs_create_files() Wambui Karuga
2020-03-11 16:44 ` Lucas Stach
2020-03-10 13:31 ` [PATCH v2 08/17] drm/msm: remove checks " Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 09/17] drm/sti: remove use of drm_debugfs functions as return values Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 10/17] drm/vram-helper: make drm_vram_mm_debugfs_init() return 0 Wambui Karuga
2020-03-18 15:26 ` Daniel Vetter
2020-03-18 16:02 ` Wambui Karuga
2020-03-18 16:31 ` Daniel Vetter
2020-03-18 16:58 ` Greg KH
2020-03-18 19:10 ` Daniel Vetter
2020-03-19 7:55 ` Greg KH
2020-03-19 10:18 ` Daniel Vetter
2020-03-19 12:27 ` Wambui Karuga
2020-04-07 6:36 ` Thomas Zimmermann
2020-03-10 13:31 ` [PATCH v2 11/17] drm/nouveau: make nouveau_drm_debugfs_init() " Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 12/17] drm/pl111: make pl111_debugfs_init " Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 13/17] drm/omap: remove checks for return value of drm_debugfs functions Wambui Karuga
2020-03-10 13:31 ` [PATCH v2 14/17] drm/i915: have *_debugfs_init() functions return void Wambui Karuga
2020-03-11 8:15 ` Jani Nikula
2020-03-10 13:31 ` [PATCH v2 15/17] drm: make various debugfs_init() functions return 0 Wambui Karuga
2020-03-10 13:31 ` Wambui Karuga [this message]
2020-03-10 13:31 ` [PATCH v2 17/17] drm: convert .debugfs_init() hook to return void Wambui Karuga
2020-03-10 14:33 ` [PATCH v2 00/17] drm: subsytem-wide debugfs functions refactor Greg KH
2020-03-18 16:54 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200310133121.27913-17-wambui.karugax@gmail.com \
--to=wambui.karugax@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®