Unverified Commit 0d5edcc6 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Rodrigo Vivi
Browse files

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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240516160015.2260-1-michal.wajdeczko@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 0d113070

drivers/gpu/drm/drm_print.c

+0 −19
Original line number Diff line number Diff line
@@ -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;

include/drm/drm_print.h

+3 −5
Original line number Diff line number Diff line
@@ -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 */