diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2020-02-14 18:54:42 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2020-02-15 14:39:35 +0100 |
| commit | acce61bf85f8744379640ec8dfca26a8c2096f1f (patch) | |
| tree | b37e1b92e264d1aed01ced24e7dc7c9032431231 | |
| parent | 9ce12ec8ab4846947f3ca822fe9a2eedb2a362a9 (diff) | |
| download | linux-acce61bf85f8744379640ec8dfca26a8c2096f1f.tar.bz2 | |
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@ravnborg.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200214175919.GA14492@ravnborg.org
| -rw-r--r-- | include/drm/drm_print.h | 27 |
1 files 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 |