Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07613b0b authored by Jason Baron's avatar Jason Baron Committed by Greg Kroah-Hartman
Browse files

dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions 



Replace the repetitive struct _ddebug descriptor definitions with a new
DECLARE_DYNAMIC_DEBUG_META_DATA(name, fmt) macro.

[akpm@linux-foundation.org: s/DECLARE/DEFINE/]
Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 27a90700

include/linux/dynamic_debug.h

+35 −29
Original line number Diff line number Diff line
@@ -54,34 +54,40 @@ extern int __dynamic_netdev_dbg(struct _ddebug *descriptor, 
			     const char *fmt, ...)

	__attribute__ ((format (printf, 3, 4)));



#define dynamic_pr_debug(fmt, ...) do {					\

	static struct _ddebug descriptor				\

	__used								\

	__attribute__((section("__verbose"), aligned(8))) =		\

	{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,		\

		_DPRINTK_FLAGS_DEFAULT };				\

#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)		\

	static struct _ddebug __used __aligned(8)		\

	__attribute__((section("__verbose"))) name = {		\

		.modname = KBUILD_MODNAME,			\

		.function = __func__,				\

		.filename = __FILE__,				\

		.format = (fmt),				\

		.lineno = __LINE__,				\

		.flags =  _DPRINTK_FLAGS_DEFAULT,		\

		.enabled = false,				\

	}



#define dynamic_pr_debug(fmt, ...)				\

do {								\

	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);		\

	if (unlikely(descriptor.enabled))			\

		__dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \

		__dynamic_pr_debug(&descriptor, pr_fmt(fmt),	\

				   ##__VA_ARGS__);		\

} while (0)



#define dynamic_dev_dbg(dev, fmt, ...) do {				\

	static struct _ddebug descriptor				\

	__used								\

	__attribute__((section("__verbose"), aligned(8))) =		\

	{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,		\

		_DPRINTK_FLAGS_DEFAULT };				\

#define dynamic_dev_dbg(dev, fmt, ...)				\

do {								\

	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);	\

	if (unlikely(descriptor.enabled))			\

		__dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);	\

		__dynamic_dev_dbg(&descriptor, dev, fmt,	\

				  ##__VA_ARGS__);		\

} while (0)



#define dynamic_netdev_dbg(dev, fmt, ...) do {				\

	static struct _ddebug descriptor				\

	__used								\

	__attribute__((section("__verbose"), aligned(8))) =		\

	{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,		\

		_DPRINTK_FLAGS_DEFAULT };				\

#define dynamic_netdev_dbg(dev, fmt, ...)			\

do {								\

	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);		\

	if (unlikely(descriptor.enabled))			\

		__dynamic_netdev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\

		__dynamic_netdev_dbg(&descriptor, dev, fmt,	\

				     ##__VA_ARGS__);		\

} while (0)



#else