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: Jason Baron <jbaron@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
27a90700a4
commit
07613b0b5e
|
@ -54,34 +54,40 @@ extern int __dynamic_netdev_dbg(struct _ddebug *descriptor,
|
||||||
const char *fmt, ...)
|
const char *fmt, ...)
|
||||||
__attribute__ ((format (printf, 3, 4)));
|
__attribute__ ((format (printf, 3, 4)));
|
||||||
|
|
||||||
#define dynamic_pr_debug(fmt, ...) do { \
|
#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \
|
||||||
static struct _ddebug descriptor \
|
static struct _ddebug __used __aligned(8) \
|
||||||
__used \
|
__attribute__((section("__verbose"))) name = { \
|
||||||
__attribute__((section("__verbose"), aligned(8))) = \
|
.modname = KBUILD_MODNAME, \
|
||||||
{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
|
.function = __func__, \
|
||||||
_DPRINTK_FLAGS_DEFAULT }; \
|
.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)) \
|
if (unlikely(descriptor.enabled)) \
|
||||||
__dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \
|
__dynamic_pr_debug(&descriptor, pr_fmt(fmt), \
|
||||||
|
##__VA_ARGS__); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define dynamic_dev_dbg(dev, fmt, ...) do { \
|
#define dynamic_dev_dbg(dev, fmt, ...) \
|
||||||
static struct _ddebug descriptor \
|
do { \
|
||||||
__used \
|
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
|
||||||
__attribute__((section("__verbose"), aligned(8))) = \
|
|
||||||
{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
|
|
||||||
_DPRINTK_FLAGS_DEFAULT }; \
|
|
||||||
if (unlikely(descriptor.enabled)) \
|
if (unlikely(descriptor.enabled)) \
|
||||||
__dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__); \
|
__dynamic_dev_dbg(&descriptor, dev, fmt, \
|
||||||
|
##__VA_ARGS__); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define dynamic_netdev_dbg(dev, fmt, ...) do { \
|
#define dynamic_netdev_dbg(dev, fmt, ...) \
|
||||||
static struct _ddebug descriptor \
|
do { \
|
||||||
__used \
|
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
|
||||||
__attribute__((section("__verbose"), aligned(8))) = \
|
|
||||||
{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
|
|
||||||
_DPRINTK_FLAGS_DEFAULT }; \
|
|
||||||
if (unlikely(descriptor.enabled)) \
|
if (unlikely(descriptor.enabled)) \
|
||||||
__dynamic_netdev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\
|
__dynamic_netdev_dbg(&descriptor, dev, fmt, \
|
||||||
|
##__VA_ARGS__); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue