drm/print: Kill ___drm_dbg()

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>
Link: https://patchwork.freedesktop.org/patch/msgid/20240516160015.2260-1-michal.wajdeczko@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index cf2efb44722c92a0ed60197722629f2f19fc8801..7e16ce7c7c7af91b817186722c39646c6e3e9a7e 100644 (file)
--- 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 112f8830b372d2a733935d056153d62c7159a599..679a2086fbea1ae42a8f4f673a1f9ea19b6e4c43 100644 (file)
--- 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 */