Commit fd71fc38 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: stop returning errors from debugfs registration 



Failures to register debugfs should be ignored anyway, so stop
propagating errors altogether for clarity and simplicity. No functional
changes.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/346562ccef2282ccdbdea54409fab1d2b48f313c.1630327990.git.jani.nikula@intel.com
parent 5ec2b4f7

drivers/gpu/drm/i915/display/intel_display_debugfs.c

+5 −14
Original line number Diff line number Diff line
@@ -2442,17 +2442,15 @@ static const struct file_operations i915_dsc_bpp_fops = { 
 *

 * Cleanup will be done by drm_connector_unregister() through a call to

 * drm_debugfs_connector_remove().

 *

 * Returns 0 on success, negative error codes on error.

 */

int intel_connector_debugfs_add(struct drm_connector *connector)

void intel_connector_debugfs_add(struct drm_connector *connector)

{

	struct dentry *root = connector->debugfs_entry;

	struct drm_i915_private *dev_priv = to_i915(connector->dev);



	/* The connector must have been registered beforehands. */

	if (!root)

		return -ENODEV;

		return;



	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {

		debugfs_create_file("i915_panel_timings", S_IRUGO, root,
@@ -2492,23 +2490,16 @@ int intel_connector_debugfs_add(struct drm_connector *connector) 
	    connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)

		debugfs_create_file("i915_lpsp_capability", 0444, root,

				    connector, &i915_lpsp_capability_fops);



	return 0;

}



/**

 * intel_crtc_debugfs_add - add i915 specific crtc debugfs files

 * @crtc: pointer to a drm_crtc

 *

 * Returns 0 on success, negative error codes on error.

 *

 * Failure to add debugfs entries should generally be ignored.

 */

int intel_crtc_debugfs_add(struct drm_crtc *crtc)

void intel_crtc_debugfs_add(struct drm_crtc *crtc)

{

	if (!crtc->debugfs_entry)

		return -ENODEV;



	if (crtc->debugfs_entry)

		crtc_updates_add(crtc);

	return 0;

}

drivers/gpu/drm/i915/display/intel_display_debugfs.h

+4 −4
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ struct drm_i915_private; 


#ifdef CONFIG_DEBUG_FS

void intel_display_debugfs_register(struct drm_i915_private *i915);

int intel_connector_debugfs_add(struct drm_connector *connector);

int intel_crtc_debugfs_add(struct drm_crtc *crtc);

void intel_connector_debugfs_add(struct drm_connector *connector);

void intel_crtc_debugfs_add(struct drm_crtc *crtc);

#else

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

static inline int intel_crtc_debugfs_add(struct drm_crtc *crtc) { return 0; }

static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}

static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}

#endif



#endif /* __INTEL_DISPLAY_DEBUGFS_H__ */