[Intel-gfx] [PATCH 3/4] drm/i915/display: remove I915_STATE_WARN_ON()

[Rodrigo Vivi]

On Fri, May 12, 2023 at 02:04:43PM +0300, Jani Nikula wrote:
> Remove the unused macro.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>


Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.h | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index ac95961f68ba..8f451aaf5760 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -538,12 +538,12 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
>  #define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)
>  #define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)
>  
> -/* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and
> - * WARN_ON()) for hw state sanity checks to check for unexpected conditions
> - * which may not necessarily be a user visible problem.  This will either
> - * WARN() or DRM_ERROR() depending on the verbose_checks moduleparam, to
> - * enable distros and users to tailor their preferred amount of i915 abrt
> - * spam.
> +/*
> + * Use I915_STATE_WARN(x) (rather than WARN() and WARN_ON()) for hw state sanity
> + * checks to check for unexpected conditions which may not necessarily be a user
> + * visible problem. This will either WARN() or DRM_ERROR() depending on the
> + * verbose_state_checks module param, to enable distros and users to tailor
> + * their preferred amount of i915 abrt spam.
>   */
>  #define I915_STATE_WARN(condition, format...) ({			\
>  	int __ret_warn_on = !!(condition);				\
> @@ -553,9 +553,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
>  	unlikely(__ret_warn_on);					\
>  })
>  
> -#define I915_STATE_WARN_ON(x)						\
> -	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
> -
>  bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915);
>  
>  #endif
> -- 
> 2.39.2
>