All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wambui Karuga <wambui.karugax@gmail.com>
To: daniel@ffwll.ch, airlied@linux.ie, Gerd Hoffmann <kraxel@redhat.com>
Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
	dri-devel@lists.freedesktop.org
Subject: [PATCH 20/21] drm/qxl: have debugfs functions return void.
Date: Thu, 27 Feb 2020 15:02:31 +0300	[thread overview]
Message-ID: <20200227120232.19413-21-wambui.karugax@gmail.com> (raw)
In-Reply-To: <20200227120232.19413-1-wambui.karugax@gmail.com>

Due to the conversion of the .debugfs_init() hook to return void
(drm: convert the .debugfs_init() hook to return void), there
is no need for the return value of qxl_debugfs_init(). Therefore,
refactor the function to return void.

This change also includes the conversion of various functions that can
be converted to return void as a result of the changes to
qxl_debugfs_init().

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
---
 drivers/gpu/drm/qxl/qxl_debugfs.c | 21 +++++++--------------
 drivers/gpu/drm/qxl/qxl_drv.h     | 13 +++++--------
 drivers/gpu/drm/qxl/qxl_ttm.c     |  6 ++----
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index a4f4175bbdbe..88123047fdd4 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -79,36 +79,30 @@ static struct drm_info_list qxl_debugfs_list[] = {
 #define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
 #endif
 
-int
+void
 qxl_debugfs_init(struct drm_minor *minor)
 {
 #if defined(CONFIG_DEBUG_FS)
-	int r;
 	struct qxl_device *dev =
 		(struct qxl_device *) minor->dev->dev_private;
 
 	drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
 				 minor->debugfs_root, minor);
 
-	r = qxl_ttm_debugfs_init(dev);
-	if (r) {
-		DRM_ERROR("Failed to init TTM debugfs\n");
-		return r;
-	}
+	qxl_ttm_debugfs_init(dev);
 #endif
-	return 0;
 }
 
-int qxl_debugfs_add_files(struct qxl_device *qdev,
-			  struct drm_info_list *files,
-			  unsigned int nfiles)
+void qxl_debugfs_add_files(struct qxl_device *qdev,
+			   struct drm_info_list *files,
+			   unsigned int nfiles)
 {
 	unsigned int i;
 
 	for (i = 0; i < qdev->debugfs_count; i++) {
 		if (qdev->debugfs[i].files == files) {
 			/* Already registered */
-			return 0;
+			return;
 		}
 	}
 
@@ -116,7 +110,7 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
 	if (i > QXL_DEBUGFS_MAX_COMPONENTS) {
 		DRM_ERROR("Reached maximum number of debugfs components.\n");
 		DRM_ERROR("Report so we increase QXL_DEBUGFS_MAX_COMPONENTS.\n");
-		return -EINVAL;
+		return;
 	}
 	qdev->debugfs[qdev->debugfs_count].files = files;
 	qdev->debugfs[qdev->debugfs_count].num_files = nfiles;
@@ -126,5 +120,4 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
 				 qdev->ddev.primary->debugfs_root,
 				 qdev->ddev.primary);
 #endif
-	return 0;
 }
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 27e45a2d6b52..435126facc9b 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -190,9 +190,6 @@ struct qxl_debugfs {
 	unsigned int num_files;
 };
 
-int qxl_debugfs_add_files(struct qxl_device *rdev,
-			     struct drm_info_list *files,
-			     unsigned int nfiles);
 int qxl_debugfs_fence_init(struct qxl_device *rdev);
 
 struct qxl_device;
@@ -442,8 +439,8 @@ int qxl_garbage_collect(struct qxl_device *qdev);
 
 /* debugfs */
 
-int qxl_debugfs_init(struct drm_minor *minor);
-int qxl_ttm_debugfs_init(struct qxl_device *qdev);
+void qxl_debugfs_init(struct drm_minor *minor);
+void qxl_ttm_debugfs_init(struct qxl_device *qdev);
 
 /* qxl_prime.c */
 int qxl_gem_prime_pin(struct drm_gem_object *obj);
@@ -461,9 +458,9 @@ int qxl_gem_prime_mmap(struct drm_gem_object *obj,
 int qxl_irq_init(struct qxl_device *qdev);
 irqreturn_t qxl_irq_handler(int irq, void *arg);
 
-int qxl_debugfs_add_files(struct qxl_device *qdev,
-			  struct drm_info_list *files,
-			  unsigned int nfiles);
+void qxl_debugfs_add_files(struct qxl_device *qdev,
+			   struct drm_info_list *files,
+			   unsigned int nfiles);
 
 int qxl_surface_id_alloc(struct qxl_device *qdev,
 			 struct qxl_bo *surf);
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 62a5e424971b..93a2eb14844b 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -322,7 +322,7 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
 }
 #endif
 
-int qxl_ttm_debugfs_init(struct qxl_device *qdev)
+void qxl_ttm_debugfs_init(struct qxl_device *qdev)
 {
 #if defined(CONFIG_DEBUG_FS)
 	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
@@ -343,8 +343,6 @@ int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
 
 	}
-	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
-#else
-	return 0;
+	qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
 #endif
 }
-- 
2.25.0


WARNING: multiple messages have this Message-ID (diff)
From: Wambui Karuga <wambui.karugax@gmail.com>
To: daniel@ffwll.ch, airlied@linux.ie, Gerd Hoffmann <kraxel@redhat.com>
Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org
Subject: [PATCH 20/21] drm/qxl: have debugfs functions return void.
Date: Thu, 27 Feb 2020 15:02:31 +0300	[thread overview]
Message-ID: <20200227120232.19413-21-wambui.karugax@gmail.com> (raw)
In-Reply-To: <20200227120232.19413-1-wambui.karugax@gmail.com>

Due to the conversion of the .debugfs_init() hook to return void
(drm: convert the .debugfs_init() hook to return void), there
is no need for the return value of qxl_debugfs_init(). Therefore,
refactor the function to return void.

This change also includes the conversion of various functions that can
be converted to return void as a result of the changes to
qxl_debugfs_init().

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
---
 drivers/gpu/drm/qxl/qxl_debugfs.c | 21 +++++++--------------
 drivers/gpu/drm/qxl/qxl_drv.h     | 13 +++++--------
 drivers/gpu/drm/qxl/qxl_ttm.c     |  6 ++----
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index a4f4175bbdbe..88123047fdd4 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -79,36 +79,30 @@ static struct drm_info_list qxl_debugfs_list[] = {
 #define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
 #endif
 
-int
+void
 qxl_debugfs_init(struct drm_minor *minor)
 {
 #if defined(CONFIG_DEBUG_FS)
-	int r;
 	struct qxl_device *dev =
 		(struct qxl_device *) minor->dev->dev_private;
 
 	drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
 				 minor->debugfs_root, minor);
 
-	r = qxl_ttm_debugfs_init(dev);
-	if (r) {
-		DRM_ERROR("Failed to init TTM debugfs\n");
-		return r;
-	}
+	qxl_ttm_debugfs_init(dev);
 #endif
-	return 0;
 }
 
-int qxl_debugfs_add_files(struct qxl_device *qdev,
-			  struct drm_info_list *files,
-			  unsigned int nfiles)
+void qxl_debugfs_add_files(struct qxl_device *qdev,
+			   struct drm_info_list *files,
+			   unsigned int nfiles)
 {
 	unsigned int i;
 
 	for (i = 0; i < qdev->debugfs_count; i++) {
 		if (qdev->debugfs[i].files == files) {
 			/* Already registered */
-			return 0;
+			return;
 		}
 	}
 
@@ -116,7 +110,7 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
 	if (i > QXL_DEBUGFS_MAX_COMPONENTS) {
 		DRM_ERROR("Reached maximum number of debugfs components.\n");
 		DRM_ERROR("Report so we increase QXL_DEBUGFS_MAX_COMPONENTS.\n");
-		return -EINVAL;
+		return;
 	}
 	qdev->debugfs[qdev->debugfs_count].files = files;
 	qdev->debugfs[qdev->debugfs_count].num_files = nfiles;
@@ -126,5 +120,4 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
 				 qdev->ddev.primary->debugfs_root,
 				 qdev->ddev.primary);
 #endif
-	return 0;
 }
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 27e45a2d6b52..435126facc9b 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -190,9 +190,6 @@ struct qxl_debugfs {
 	unsigned int num_files;
 };
 
-int qxl_debugfs_add_files(struct qxl_device *rdev,
-			     struct drm_info_list *files,
-			     unsigned int nfiles);
 int qxl_debugfs_fence_init(struct qxl_device *rdev);
 
 struct qxl_device;
@@ -442,8 +439,8 @@ int qxl_garbage_collect(struct qxl_device *qdev);
 
 /* debugfs */
 
-int qxl_debugfs_init(struct drm_minor *minor);
-int qxl_ttm_debugfs_init(struct qxl_device *qdev);
+void qxl_debugfs_init(struct drm_minor *minor);
+void qxl_ttm_debugfs_init(struct qxl_device *qdev);
 
 /* qxl_prime.c */
 int qxl_gem_prime_pin(struct drm_gem_object *obj);
@@ -461,9 +458,9 @@ int qxl_gem_prime_mmap(struct drm_gem_object *obj,
 int qxl_irq_init(struct qxl_device *qdev);
 irqreturn_t qxl_irq_handler(int irq, void *arg);
 
-int qxl_debugfs_add_files(struct qxl_device *qdev,
-			  struct drm_info_list *files,
-			  unsigned int nfiles);
+void qxl_debugfs_add_files(struct qxl_device *qdev,
+			   struct drm_info_list *files,
+			   unsigned int nfiles);
 
 int qxl_surface_id_alloc(struct qxl_device *qdev,
 			 struct qxl_bo *surf);
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 62a5e424971b..93a2eb14844b 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -322,7 +322,7 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
 }
 #endif
 
-int qxl_ttm_debugfs_init(struct qxl_device *qdev)
+void qxl_ttm_debugfs_init(struct qxl_device *qdev)
 {
 #if defined(CONFIG_DEBUG_FS)
 	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
@@ -343,8 +343,6 @@ int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
 
 	}
-	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
-#else
-	return 0;
+	qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
 #endif
 }
-- 
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 12:04 UTC|newest]

Thread overview: 88+ 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 ` 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   ` 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:02   ` Wambui Karuga
2020-02-27 12:23   ` Greg KH
2020-02-27 12:23     ` Greg KH
2020-02-27 12:29     ` Wambui Karuga
2020-02-27 12:29       ` Wambui Karuga
2020-02-27 12:34       ` Greg KH
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   ` Wambui Karuga
2020-02-27 12:02 ` [PATCH 04/21] drm/vram-helper: make drm_vram_mm_debugfs_init() " Wambui Karuga
2020-02-27 12:02   ` Wambui Karuga
2020-02-28  8:03   ` Thomas Zimmermann
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   ` Wambui Karuga
2020-02-27 12:02 ` [PATCH 06/21] drm/arc: make arcpgu_debugfs_init return void Wambui Karuga
2020-02-27 12:02   ` Wambui Karuga
2020-02-27 14:43   ` Alexey Brodkin
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 12:02   ` Wambui Karuga
2020-02-27 14:53   ` Liviu Dudau
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 12:02   ` Wambui Karuga
2020-02-27 13:36   ` Lucas Stach
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   ` Wambui Karuga
2020-02-27 12:02   ` Wambui Karuga
     [not found] ` <20200227120232.19413-1-wambui.karugax-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-27 12:02   ` [PATCH 10/21] drm/tegra: remove checks for debugfs functions return value Wambui Karuga
2020-02-27 12:02     ` Wambui Karuga
2020-02-27 12:02     ` Wambui Karuga
     [not found]     ` <20200227120232.19413-11-wambui.karugax-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-03-11 14:37       ` Thierry Reding
2020-03-11 14:37         ` Thierry Reding
2020-03-11 14:37         ` Thierry Reding
2020-03-11 14:54         ` Wambui Karuga
2020-03-11 14:54           ` Wambui Karuga
2020-03-11 14:54           ` Wambui Karuga
2020-03-11 23:24           ` Thierry Reding
2020-03-11 23:24             ` Thierry Reding
2020-03-11 23:24             ` Thierry Reding
2020-03-16  8:33             ` Daniel Vetter
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
2020-02-27 12:02 ` [PATCH 12/21] drm/msm: remove checks for return value of drm_debugfs functions Wambui Karuga
2020-02-27 12:02   ` Wambui Karuga
2020-02-27 14:45   ` Daniel Vetter
2020-02-27 14:45     ` Daniel Vetter
2020-02-28  7:24   ` kbuild test robot
2020-02-28  7:24     ` kbuild test robot
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   ` 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   ` 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 12:02   ` Wambui Karuga
2020-02-27 14:51   ` Daniel Vetter
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 12:02   ` [Intel-gfx] " Wambui Karuga
2020-02-27 12:02   ` Wambui Karuga
2020-02-27 13:08   ` Jani Nikula
2020-02-27 13:08     ` [Intel-gfx] " Jani Nikula
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:02   ` Wambui Karuga
2020-02-27 12:12   ` Jyri Sarha
2020-02-27 12:12     ` Jyri Sarha
2020-02-27 12:23     ` Wambui Karuga
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   ` 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   ` Wambui Karuga
2020-02-27 12:02 ` Wambui Karuga [this message]
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 12:02   ` Wambui Karuga
2020-02-27 14:53   ` Liviu Dudau
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-21-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=kraxel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.