dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Wambui Karuga <wambui.karugax@gmail.com>
To: daniel@ffwll.ch, airlied@linux.ie,
	Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>
Cc: gregkh@linuxfoundation.org, freedreno@lists.freedesktop.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-arm-msm@vger.kernel.org
Subject: [PATCH 12/21] drm/msm: remove checks for return value of drm_debugfs functions.
Date: Thu, 27 Feb 2020 15:02:23 +0300	[thread overview]
Message-ID: <20200227120232.19413-13-wambui.karugax@gmail.com> (raw)
In-Reply-To: <20200227120232.19413-1-wambui.karugax@gmail.com>

Since commit 987d65d01356 (drm: debugfs: make
drm_debugfs_create_files() never fail), drm_debugfs_create_files() does
not fail, and should return void. This change therefore removes the
checks of its return value in drm/msm and subsequent error handling.

These changes also enable the changing of various debugfs_init()
functions to return void.

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
---
 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 18 +++++-------------
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c  | 14 +++-----------
 drivers/gpu/drm/msm/msm_debugfs.c         | 21 ++++++---------------
 drivers/gpu/drm/msm/msm_debugfs.h         |  2 +-
 drivers/gpu/drm/msm/msm_gpu.h             |  2 +-
 5 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
index 075ecce4b5e0..8cae2ca4af6b 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
@@ -148,27 +148,19 @@ reset_set(void *data, u64 val)
 DEFINE_SIMPLE_ATTRIBUTE(reset_fops, NULL, reset_set, "%llx\n");
 
 
-int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)
+void a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)
 {
 	struct drm_device *dev;
-	int ret;
 
 	if (!minor)
-		return 0;
+		return;
 
 	dev = minor->dev;
 
-	ret = drm_debugfs_create_files(a5xx_debugfs_list,
-			ARRAY_SIZE(a5xx_debugfs_list),
-			minor->debugfs_root, minor);
-
-	if (ret) {
-		DRM_DEV_ERROR(dev->dev, "could not install a5xx_debugfs_list\n");
-		return ret;
-	}
+	drm_debugfs_create_files(a5xx_debugfs_list,
+				 ARRAY_SIZE(a5xx_debugfs_list),
+				 minor->debugfs_root, minor);
 
 	debugfs_create_file("reset", S_IWUGO, minor->debugfs_root, dev,
 			    &reset_fops);
-
-	return 0;
 }
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 6650f478b226..41b461128bbc 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -259,17 +259,9 @@ static struct drm_info_list mdp5_debugfs_list[] = {
 
 static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
 {
-	struct drm_device *dev = minor->dev;
-	int ret;
-
-	ret = drm_debugfs_create_files(mdp5_debugfs_list,
-			ARRAY_SIZE(mdp5_debugfs_list),
-			minor->debugfs_root, minor);
-
-	if (ret) {
-		DRM_DEV_ERROR(dev->dev, "could not install mdp5_debugfs_list\n");
-		return ret;
-	}
+	drm_debugfs_create_files(mdp5_debugfs_list,
+				 ARRAY_SIZE(mdp5_debugfs_list),
+				 minor->debugfs_root, minor);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c
index 1c74381a4fc9..3c958f311bbc 100644
--- a/drivers/gpu/drm/msm/msm_debugfs.c
+++ b/drivers/gpu/drm/msm/msm_debugfs.c
@@ -214,31 +214,22 @@ int msm_debugfs_late_init(struct drm_device *dev)
 	return ret;
 }
 
-int msm_debugfs_init(struct drm_minor *minor)
+void msm_debugfs_init(struct drm_minor *minor)
 {
 	struct drm_device *dev = minor->dev;
 	struct msm_drm_private *priv = dev->dev_private;
-	int ret;
+	int ret = 0;
 
-	ret = drm_debugfs_create_files(msm_debugfs_list,
-			ARRAY_SIZE(msm_debugfs_list),
-			minor->debugfs_root, minor);
-
-	if (ret) {
-		DRM_DEV_ERROR(dev->dev, "could not install msm_debugfs_list\n");
-		return ret;
-	}
+	drm_debugfs_create_files(msm_debugfs_list,
+				 ARRAY_SIZE(msm_debugfs_list),
+				 minor->debugfs_root, minor);
 
 	debugfs_create_file("gpu", S_IRUSR, minor->debugfs_root,
 		dev, &msm_gpu_fops);
 
 	if (priv->kms && priv->kms->funcs->debugfs_init) {
-		ret = priv->kms->funcs->debugfs_init(priv->kms, minor);
-		if (ret)
-			return ret;
+		priv->kms->funcs->debugfs_init(priv->kms, minor);
 	}
-
-	return ret;
 }
 #endif
 
diff --git a/drivers/gpu/drm/msm/msm_debugfs.h b/drivers/gpu/drm/msm/msm_debugfs.h
index 2b91f8c178ad..ef58f66abbb3 100644
--- a/drivers/gpu/drm/msm/msm_debugfs.h
+++ b/drivers/gpu/drm/msm/msm_debugfs.h
@@ -8,7 +8,7 @@
 #define __MSM_DEBUGFS_H__
 
 #ifdef CONFIG_DEBUG_FS
-int msm_debugfs_init(struct drm_minor *minor);
+void msm_debugfs_init(struct drm_minor *minor);
 #endif
 
 #endif /* __MSM_DEBUGFS_H__ */
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index be5bc2e8425c..6ccae4ba905c 100644
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -57,7 +57,7 @@ struct msm_gpu_funcs {
 	void (*show)(struct msm_gpu *gpu, struct msm_gpu_state *state,
 			struct drm_printer *p);
 	/* for generation specific debugfs: */
-	int (*debugfs_init)(struct msm_gpu *gpu, struct drm_minor *minor);
+	void (*debugfs_init)(struct msm_gpu *gpu, struct drm_minor *minor);
 #endif
 	unsigned long (*gpu_busy)(struct msm_gpu *gpu);
 	struct msm_gpu_state *(*gpu_state_get)(struct msm_gpu *gpu);
-- 
2.25.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-02-27 13:00 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-27 12:02 [PATCH 00/21] drm: subsytem-wide debugfs functions refactor Wambui Karuga
2020-02-27 12:02 ` [PATCH 01/21] drm/debugfs: remove checks for return value of drm_debugfs functions Wambui Karuga
2020-02-27 12:02 ` [PATCH 02/21] drm: convert the drm_driver.debugfs_init() hook to return void Wambui Karuga
2020-02-27 12:23   ` Greg KH
2020-02-27 12:29     ` Wambui Karuga
2020-02-27 12:34       ` Greg KH
2020-02-27 12:02 ` [PATCH 03/21] drm: convert drm_debugfs functions " Wambui Karuga
2020-02-27 12:02 ` [PATCH 04/21] drm/vram-helper: make drm_vram_mm_debugfs_init() " Wambui Karuga
2020-02-28  8:03   ` Thomas Zimmermann
2020-02-27 12:02 ` [PATCH 05/21] drm/vc4: remove check of return value of drm_debugfs functions Wambui Karuga
2020-02-27 12:02 ` [PATCH 06/21] drm/arc: make arcpgu_debugfs_init return void Wambui Karuga
2020-02-27 14:43   ` Alexey Brodkin
2020-02-27 12:02 ` [PATCH 07/21] drm/arm: make hdlcd_debugfs_init() " Wambui Karuga
2020-02-27 14:53   ` Liviu Dudau
2020-02-27 12:02 ` [PATCH 08/21] drm/etnaviv: remove check for return value of drm_debugfs function Wambui Karuga
2020-02-27 13:36   ` Lucas Stach
2020-02-27 12:02 ` [PATCH 09/21] drm/nouveau: remove checks for return value of debugfs functions Wambui Karuga
2020-02-27 12:02 ` [PATCH 10/21] drm/tegra: remove checks for debugfs functions return value Wambui Karuga
2020-03-11 14:37   ` Thierry Reding
2020-03-11 14:54     ` Wambui Karuga
2020-03-11 23:24       ` Thierry Reding
2020-03-16  8:33         ` Daniel Vetter
2020-02-27 12:02 ` [PATCH 11/21] drm/v3d: make v3d_debugfs_init return void Wambui Karuga
2020-02-27 12:02 ` Wambui Karuga [this message]
2020-02-27 14:45   ` [PATCH 12/21] drm/msm: remove checks for return value of drm_debugfs functions Daniel Vetter
2020-02-28  7:24   ` kbuild test robot
2020-02-27 12:02 ` [PATCH 13/21] drm/omapdrm: " Wambui Karuga
2020-02-27 12:02 ` [PATCH 14/21] drm/pl111: make pl111_debugfs_init return void Wambui Karuga
2020-02-27 12:02 ` [PATCH 15/21] drm/sti: remove use drm_debugfs functions as return value Wambui Karuga
2020-02-27 14:51   ` Daniel Vetter
2020-02-27 12:02 ` [PATCH 16/21] drm/i915: make *_debugfs_register() functions return void Wambui Karuga
2020-02-27 13:08   ` Jani Nikula
2020-02-27 12:02 ` [PATCH 17/21] drm/tilcdc: remove check for return value of debugfs functions Wambui Karuga
2020-02-27 12:12   ` Jyri Sarha
2020-02-27 12:23     ` Wambui Karuga
2020-02-27 12:02 ` [PATCH 18/21] drm/virtio: make virtio_gpu_debugfs() return void Wambui Karuga
2020-02-27 12:02 ` [PATCH 19/21] drm/mipi_dbi: make midi_dbi_debugfs_init() " Wambui Karuga
2020-02-27 12:02 ` [PATCH 20/21] drm/qxl: have debugfs functions " Wambui Karuga
2020-02-27 12:02 ` [PATCH 21/21] drm/arm: have malidp_debufs_init() " Wambui Karuga
2020-02-27 14:53   ` Liviu Dudau

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=20200227120232.19413-13-wambui.karugax@gmail.com \
    --to=wambui.karugax@gmail.com \
    --cc=airlied@linux.ie \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robdclark@gmail.com \
    --cc=sean@poorly.run \
    /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