From: Wambui Karuga <wambui.karugax@gmail.com>
To: airlied@linux.ie, daniel@ffwll.ch,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
gregkh@linuxfoundation.org, intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 14/17] drm/i915: have *_debugfs_init() functions return void.
Date: Tue, 10 Mar 2020 16:31:18 +0300 [thread overview]
Message-ID: <20200310133121.27913-15-wambui.karugax@gmail.com> (raw)
In-Reply-To: <20200310133121.27913-1-wambui.karugax@gmail.com>
Since commit 987d65d01356 (drm: debugfs: make
drm_debugfs_create_files() never fail), drm_debugfs_create_files() never
fails and should return void. Therefore, remove its use as the
return value of debugfs_init() functions and have the functions return
void.
v2: convert intel_display_debugfs_register() stub to return void too.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
---
drivers/gpu/drm/i915/display/intel_display_debugfs.c | 8 ++++----
drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++----
drivers/gpu/drm/i915/i915_debugfs.h | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 1e6eb7f2f72d..424f4e52f783 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -1927,7 +1927,7 @@ static const struct {
{"i915_edp_psr_debug", &i915_edp_psr_debug_fops},
};
-int intel_display_debugfs_register(struct drm_i915_private *i915)
+void intel_display_debugfs_register(struct drm_i915_private *i915)
{
struct drm_minor *minor = i915->drm.primary;
int i;
@@ -1940,9 +1940,9 @@ int intel_display_debugfs_register(struct drm_i915_private *i915)
intel_display_debugfs_files[i].fops);
}
- return drm_debugfs_create_files(intel_display_debugfs_list,
- ARRAY_SIZE(intel_display_debugfs_list),
- minor->debugfs_root, minor);
+ drm_debugfs_create_files(intel_display_debugfs_list,
+ ARRAY_SIZE(intel_display_debugfs_list),
+ minor->debugfs_root, minor);
}
static int i915_panel_show(struct seq_file *m, void *data)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
index a3bea1ce04c2..c922c1745bfe 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
@@ -10,10 +10,10 @@ struct drm_connector;
struct drm_i915_private;
#ifdef CONFIG_DEBUG_FS
-int intel_display_debugfs_register(struct drm_i915_private *i915);
+void intel_display_debugfs_register(struct drm_i915_private *i915);
int intel_connector_debugfs_add(struct drm_connector *connector);
#else
-static inline int intel_display_debugfs_register(struct drm_i915_private *i915) { return 0; }
+static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
static inline int intel_connector_debugfs_add(struct drm_connector *connector) { return 0; }
#endif
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8f2525e4ce0f..de313199c714 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2392,7 +2392,7 @@ static const struct i915_debugfs_files {
{"i915_guc_log_relay", &i915_guc_log_relay_fops},
};
-int i915_debugfs_register(struct drm_i915_private *dev_priv)
+void i915_debugfs_register(struct drm_i915_private *dev_priv)
{
struct drm_minor *minor = dev_priv->drm.primary;
int i;
@@ -2409,7 +2409,7 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv)
i915_debugfs_files[i].fops);
}
- return drm_debugfs_create_files(i915_debugfs_list,
- I915_DEBUGFS_ENTRIES,
- minor->debugfs_root, minor);
+ drm_debugfs_create_files(i915_debugfs_list,
+ I915_DEBUGFS_ENTRIES,
+ minor->debugfs_root, minor);
}
diff --git a/drivers/gpu/drm/i915/i915_debugfs.h b/drivers/gpu/drm/i915/i915_debugfs.h
index 6da39c76ab5e..1de2736f1248 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.h
+++ b/drivers/gpu/drm/i915/i915_debugfs.h
@@ -12,10 +12,10 @@ struct drm_i915_private;
struct seq_file;
#ifdef CONFIG_DEBUG_FS
-int i915_debugfs_register(struct drm_i915_private *dev_priv);
+void i915_debugfs_register(struct drm_i915_private *dev_priv);
void i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj);
#else
-static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) { return 0; }
+static inline void i915_debugfs_register(struct drm_i915_private *dev_priv) {}
static inline void i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) {}
#endif
--
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 ` Wambui Karuga [this message]
2020-03-11 8:15 ` [PATCH v2 14/17] drm/i915: have *_debugfs_init() functions return void 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 ` [PATCH v2 16/17] drm/debugfs: remove checks for return value of drm_debugfs functions Wambui Karuga
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-15-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=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
/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®