[PATCH] drm/print: Kill ___drm_dbg()

[PATCH] drm/print: Kill ___drm_dbg()

[Michal Wajdeczko]

There is no point in maintaining a separate print function, while
there is __drm_dev_dbg() function that can work with a NULL device.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_print.c | 19 -------------------
 include/drm/drm_print.h     |  8 +++-----
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index cf2efb44722c..7e16ce7c7c7a 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -323,25 +323,6 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
 }
 EXPORT_SYMBOL(__drm_dev_dbg);
 
-void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...)
-{
-	struct va_format vaf;
-	va_list args;
-
-	if (!__drm_debug_enabled(category))
-		return;
-
-	va_start(args, format);
-	vaf.fmt = format;
-	vaf.va = &args;
-
-	printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
-	       __builtin_return_address(0), &vaf);
-
-	va_end(args);
-}
-EXPORT_SYMBOL(___drm_dbg);
-
 void __drm_err(const char *format, ...)
 {
 	struct va_format vaf;
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 089950ad8681..6f8cb5fada41 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -527,17 +527,15 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
  * Prefer drm_device based logging over device or prink based logging.
  */
 
-__printf(3, 4)
-void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...);
 __printf(1, 2)
 void __drm_err(const char *format, ...);
 
 #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
-#define __drm_dbg(cat, fmt, ...)		___drm_dbg(NULL, cat, fmt, ##__VA_ARGS__)
+#define __drm_dbg(cat, fmt, ...)	__drm_dev_dbg(NULL, NULL, cat, fmt, ##__VA_ARGS__)
 #else
 #define __drm_dbg(cat, fmt, ...)					\
-	_dynamic_func_call_cls(cat, fmt, ___drm_dbg,			\
-			       cat, fmt, ##__VA_ARGS__)
+	_dynamic_func_call_cls(cat, fmt, __drm_dev_dbg,			\
+			       NULL, cat, fmt, ##__VA_ARGS__)
 #endif
 
 /* Macros to make printk easier */
-- 
2.43.0

Re: [PATCH] drm/print: Kill ___drm_dbg()

[Jani Nikula]

On Thu, 16 May 2024, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote:
> There is no point in maintaining a separate print function, while
> there is __drm_dev_dbg() function that can work with a NULL device.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/drm_print.c | 19 -------------------
>  include/drm/drm_print.h     |  8 +++-----
>  2 files changed, 3 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index cf2efb44722c..7e16ce7c7c7a 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -323,25 +323,6 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
>  }
>  EXPORT_SYMBOL(__drm_dev_dbg);
>  
> -void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...)
> -{
> -	struct va_format vaf;
> -	va_list args;
> -
> -	if (!__drm_debug_enabled(category))
> -		return;
> -
> -	va_start(args, format);
> -	vaf.fmt = format;
> -	vaf.va = &args;
> -
> -	printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
> -	       __builtin_return_address(0), &vaf);
> -
> -	va_end(args);
> -}
> -EXPORT_SYMBOL(___drm_dbg);
> -
>  void __drm_err(const char *format, ...)
>  {
>  	struct va_format vaf;
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 089950ad8681..6f8cb5fada41 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -527,17 +527,15 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
>   * Prefer drm_device based logging over device or prink based logging.
>   */
>  
> -__printf(3, 4)
> -void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...);
>  __printf(1, 2)
>  void __drm_err(const char *format, ...);
>  
>  #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
> -#define __drm_dbg(cat, fmt, ...)		___drm_dbg(NULL, cat, fmt, ##__VA_ARGS__)
> +#define __drm_dbg(cat, fmt, ...)	__drm_dev_dbg(NULL, NULL, cat, fmt, ##__VA_ARGS__)
>  #else
>  #define __drm_dbg(cat, fmt, ...)					\
> -	_dynamic_func_call_cls(cat, fmt, ___drm_dbg,			\
> -			       cat, fmt, ##__VA_ARGS__)
> +	_dynamic_func_call_cls(cat, fmt, __drm_dev_dbg,			\
> +			       NULL, cat, fmt, ##__VA_ARGS__)
>  #endif
>  
>  /* Macros to make printk easier */

-- 
Jani Nikula, Intel