Commit 8ef2d651 authored Aug 27, 2013 by Dmitry Kasatkin Committed by Sarah Sharp Aug 28, 2013

dev-core: fix build break when DEBUG is enabled

When DEBUG is defined, dev_dbg_ratelimited uses dynamic debug data
structures even when CONFIG_DYNAMIC_DEBUG is not defined.
It leads to build break.
For example, when I try to use dev_dbg_ratelimited in USB code and
CONFIG_USB_DEBUG is enabled, but CONFIG_DYNAMIC_DEBUG is not, I get:

CC [M] drivers/usb/host/xhci-ring.o
drivers/usb/host/xhci-ring.c: In function ‘xhci_queue_intr_tx’:
drivers/usb/host/xhci-ring.c:3059:3: error: implicit declaration of function ‘DEFINE_DYNAMIC_DEBUG_METADATA’ [-Werror=implicit-function-declaration]
drivers/usb/host/xhci-ring.c:3059:3: error: ‘descriptor’ undeclared (first use in this function)
drivers/usb/host/xhci-ring.c:3059:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/usb/host/xhci-ring.c:3059:3: error: implicit declaration of function ‘__dynamic_pr_debug’ [-Werror=implicit-function-declaration]
drivers/usb/host/xhci-ring.c: In function ‘xhci_queue_isoc_tx_prepare’:
drivers/usb/host/xhci-ring.c:3847:3: error: ‘descriptor’ undeclared (first use in this function)
cc1: some warnings being treated as errors
make[2]: *** [drivers/usb/host/xhci-ring.o] Error 1
make[1]: *** [drivers/usb/host] Error 2
make: *** [drivers/usb/] Error 2

This patch separates definition for CONFIG_DYNAMIC_DEBUG and DEBUG cases.

[Note, Sarah moved the comment above the macro to avoid checkpatch
warnings.]

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 752e6955

include/linux/device.h

+13 −3

Original line number	Diff line number	Diff line
		@@ -1099,7 +1099,8 @@ do { \
		dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)
		#define dev_info_ratelimited(dev, fmt, ...) \
		dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)
		#if defined(CONFIG_DYNAMIC_DEBUG) \|\| defined(DEBUG)
		#if defined(CONFIG_DYNAMIC_DEBUG)
		/* descriptor check is first to prevent flooding with "callbacks suppressed" */
		#define dev_dbg_ratelimited(dev, fmt, ...) \
		do { \
		static DEFINE_RATELIMIT_STATE(_rs, \
		@@ -1108,9 +1109,18 @@ do { \
		DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
		if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \
		__ratelimit(&_rs)) \
		__dynamic_pr_debug(&descriptor, pr_fmt(fmt), \
		__dynamic_dev_dbg(&descriptor, dev, fmt, \
		##__VA_ARGS__); \
		} while (0)
		#elif defined(DEBUG)
		#define dev_dbg_ratelimited(dev, fmt, ...) \
		do { \
		static DEFINE_RATELIMIT_STATE(_rs, \
		DEFAULT_RATELIMIT_INTERVAL, \
		DEFAULT_RATELIMIT_BURST); \
		if (__ratelimit(&_rs)) \
		dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \
		} while (0)
		#else
		#define dev_dbg_ratelimited(dev, fmt, ...) \
		no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)

Admin message