Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: have *_debugfs_init() functions return void.

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>
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

authored by

Wambui Karuga and committed by
Daniel Vetter
f06b2052 68f73a1b

+12 -12
+4 -4
drivers/gpu/drm/i915/display/intel_display_debugfs.c
··· 1922 1922 {"i915_edp_psr_debug", &i915_edp_psr_debug_fops}, 1923 1923 }; 1924 1924 1925 - int intel_display_debugfs_register(struct drm_i915_private *i915) 1925 + void intel_display_debugfs_register(struct drm_i915_private *i915) 1926 1926 { 1927 1927 struct drm_minor *minor = i915->drm.primary; 1928 1928 int i; ··· 1935 1935 intel_display_debugfs_files[i].fops); 1936 1936 } 1937 1937 1938 - return drm_debugfs_create_files(intel_display_debugfs_list, 1939 - ARRAY_SIZE(intel_display_debugfs_list), 1940 - minor->debugfs_root, minor); 1938 + drm_debugfs_create_files(intel_display_debugfs_list, 1939 + ARRAY_SIZE(intel_display_debugfs_list), 1940 + minor->debugfs_root, minor); 1941 1941 } 1942 1942 1943 1943 static int i915_panel_show(struct seq_file *m, void *data)
+2 -2
drivers/gpu/drm/i915/display/intel_display_debugfs.h
··· 10 10 struct drm_i915_private; 11 11 12 12 #ifdef CONFIG_DEBUG_FS 13 - int intel_display_debugfs_register(struct drm_i915_private *i915); 13 + void intel_display_debugfs_register(struct drm_i915_private *i915); 14 14 int intel_connector_debugfs_add(struct drm_connector *connector); 15 15 #else 16 - static inline int intel_display_debugfs_register(struct drm_i915_private *i915) { return 0; } 16 + static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {} 17 17 static inline int intel_connector_debugfs_add(struct drm_connector *connector) { return 0; } 18 18 #endif 19 19
+4 -4
drivers/gpu/drm/i915/i915_debugfs.c
··· 2392 2392 {"i915_guc_log_relay", &i915_guc_log_relay_fops}, 2393 2393 }; 2394 2394 2395 - int i915_debugfs_register(struct drm_i915_private *dev_priv) 2395 + void i915_debugfs_register(struct drm_i915_private *dev_priv) 2396 2396 { 2397 2397 struct drm_minor *minor = dev_priv->drm.primary; 2398 2398 int i; ··· 2409 2409 i915_debugfs_files[i].fops); 2410 2410 } 2411 2411 2412 - return drm_debugfs_create_files(i915_debugfs_list, 2413 - I915_DEBUGFS_ENTRIES, 2414 - minor->debugfs_root, minor); 2412 + drm_debugfs_create_files(i915_debugfs_list, 2413 + I915_DEBUGFS_ENTRIES, 2414 + minor->debugfs_root, minor); 2415 2415 }
+2 -2
drivers/gpu/drm/i915/i915_debugfs.h
··· 12 12 struct seq_file; 13 13 14 14 #ifdef CONFIG_DEBUG_FS 15 - int i915_debugfs_register(struct drm_i915_private *dev_priv); 15 + void i915_debugfs_register(struct drm_i915_private *dev_priv); 16 16 void i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj); 17 17 #else 18 - static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) { return 0; } 18 + static inline void i915_debugfs_register(struct drm_i915_private *dev_priv) {} 19 19 static inline void i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) {} 20 20 #endif 21 21