drm/print: clean up RATELIMITED macros

[Daniel Vetter]

On Fri, Feb 14, 2020 at 06:59:19PM +0100, Sam Ravnborg wrote:
> From 6fdc9c030ba88e6d0d8abc319f3dfe83751d5900 Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam at ravnborg.org>
> Date: Fri, 14 Feb 2020 18:54:42 +0100
> Subject: [PATCH v1 1/1] drm/print: clean up RATELIMITED macros
> 
> Drop a few indirections, making the code simpler.
> This also drops a RATELIMITED variant that is not in use.
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Cc: Daniel Vetter <daniel.vetter at intel.com>

Lots of turtles here :-)

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  include/drm/drm_print.h | 27 +++++++--------------------
>  1 file changed, 7 insertions(+), 20 deletions(-)
> 
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index fd6ba2532f50..ca7cee8e728a 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -383,25 +383,6 @@ void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
>  #define DRM_DEV_DEBUG_KMS(dev, fmt, ...)				\
>  	drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__)
>  
> -#define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, category, fmt, ...)	\
> -({									\
> -	static DEFINE_RATELIMIT_STATE(_rs,				\
> -				      DEFAULT_RATELIMIT_INTERVAL,	\
> -				      DEFAULT_RATELIMIT_BURST);		\
> -	if (__ratelimit(&_rs))						\
> -		drm_dev_dbg(dev, category, fmt, ##__VA_ARGS__);		\
> -})
> -
> -/**
> - * Rate limited debug output. Like DRM_DEBUG() but won't flood the log.
> - *
> - * @dev: device pointer
> - * @fmt: printf() like format string.
> - */
> -#define DRM_DEV_DEBUG_KMS_RATELIMITED(dev, fmt, ...)			\
> -	_DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_KMS,		\
> -					  fmt, ##__VA_ARGS__)
> -
>  /*
>   * struct drm_device based logging
>   *
> @@ -525,7 +506,13 @@ void __drm_err(const char *format, ...);
>  
>  
>  #define DRM_DEBUG_KMS_RATELIMITED(fmt, ...)				\
> -	DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +({									\
> +	static DEFINE_RATELIMIT_STATE(_rs,				\
> +				      DEFAULT_RATELIMIT_INTERVAL,       \
> +				      DEFAULT_RATELIMIT_BURST);         \
> +	if (__ratelimit(&_rs))						\
> +		drm_dev_dbg(NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__);	\
> +})
>  
>  /*
>   * struct drm_device based WARNs
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch