commit 7911902129a8 ("drm/print: Handle potentially NULL drm_devices in drm_dbg_*") added a maybe(deref) to 6 macro invocations of drm_dev_dbg().
Commit 01ff672190bd("drm: RFC add choice to use dynamic debug in drm-debug") then renamed that fn to _drm_dev_dbg(), and redefined drm_dev_dbg() as a macro.
That new macro can do the maybe(deref), so the ~9 callers dont have to.
no functional changes. small word-count reduction.
Signed-off-by: Jim Cromie jim.cromie@gmail.com --- include/drm/drm_print.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 499fa0b35200..573b513e7836 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -326,8 +326,8 @@ enum drm_debug_category { */ #define __drm_dbg(cls, fmt, ...) \ ___drm_dbg(cls, fmt, ##__VA_ARGS__) -#define drm_dev_dbg(dev, cls, fmt, ...) \ - _drm_dev_dbg(dev, cls, fmt, ##__VA_ARGS__) +#define drm_dev_dbg(drm, cls, fmt, ...) \ + _drm_dev_dbg((drm) ? (drm)->dev : NULL, cls, fmt, ##__VA_ARGS__)
#define cDRM_UT_CORE DRM_UT_CORE #define cDRM_UT_DRIVER DRM_UT_DRIVER @@ -488,25 +488,25 @@ void _drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
#define drm_dbg_core(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_CORE, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_CORE, fmt, ##__VA_ARGS__) #define drm_dbg(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_DRIVER, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_DRIVER, fmt, ##__VA_ARGS__) #define drm_dbg_kms(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_KMS, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_KMS, fmt, ##__VA_ARGS__) #define drm_dbg_prime(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_PRIME, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_PRIME, fmt, ##__VA_ARGS__) #define drm_dbg_atomic(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_ATOMIC, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_ATOMIC, fmt, ##__VA_ARGS__) #define drm_dbg_vbl(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_VBL, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_VBL, fmt, ##__VA_ARGS__) #define drm_dbg_state(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_STATE, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_STATE, fmt, ##__VA_ARGS__) #define drm_dbg_lease(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_LEASE, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_LEASE, fmt, ##__VA_ARGS__) #define drm_dbg_dp(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_DP, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_DP, fmt, ##__VA_ARGS__) #define drm_dbg_drmres(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, cDRM_UT_DRMRES, fmt, ##__VA_ARGS__) + drm_dev_dbg(drm, cDRM_UT_DRMRES, fmt, ##__VA_ARGS__)
/* @@ -578,8 +578,7 @@ void __drm_err(const char *format, ...); const struct drm_device *drm_ = (drm); \ \ if (drm_debug_enabled(DRM_UT) && __ratelimit(&rs_)) \ - drm_dev_dbg((drm_) ? (drm_)->dev : NULL, \ - cDRM_UT, fmt, ##__VA_ARGS__); \ + drm_dev_dbg(drm_, cDRM_UT, fmt, ##__VA_ARGS__); \ })
#define drm_dbg_kms_ratelimited(drm, fmt, ...) \