drm/i915: have *_debugfs_init() functions return void.
Since commit 987d65d013
(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>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310133121.27913-15-wambui.karugax@gmail.com
This commit is contained in:
parent
68f73a1bef
commit
f06b2052f7
|
@ -1922,7 +1922,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;
|
||||
|
@ -1935,7 +1935,7 @@ 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,
|
||||
drm_debugfs_create_files(intel_display_debugfs_list,
|
||||
ARRAY_SIZE(intel_display_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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,
|
||||
drm_debugfs_create_files(i915_debugfs_list,
|
||||
I915_DEBUGFS_ENTRIES,
|
||||
minor->debugfs_root, minor);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue