Commit 6f586e66 authored by Hiroshi Doyu's avatar Hiroshi Doyu Committed by Greg Kroah-Hartman

driver-core: Shut up dev_dbg_reatelimited() without DEBUG

dev_dbg_reatelimited() without DEBUG printed "217078 callbacks
suppressed". This shouldn't print anything without DEBUG.

With CONFIG_DYNAMIC_DEBUG, the print should be configured as expected.
Signed-off-by: default avatarHiroshi Doyu <hdoyu@nvidia.com>
Reported-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Tested-by: default avatarAntti Palosaari <crope@iki.fi>
Tested-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Acked-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44c8b25f
...@@ -950,6 +950,32 @@ int _dev_info(const struct device *dev, const char *fmt, ...) ...@@ -950,6 +950,32 @@ int _dev_info(const struct device *dev, const char *fmt, ...)
#endif #endif
/*
* Stupid hackaround for existing uses of non-printk uses dev_info
*
* Note that the definition of dev_info below is actually _dev_info
* and a macro is used to avoid redefining dev_info
*/
#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
#if defined(CONFIG_DYNAMIC_DEBUG)
#define dev_dbg(dev, format, ...) \
do { \
dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
} while (0)
#elif defined(DEBUG)
#define dev_dbg(dev, format, arg...) \
dev_printk(KERN_DEBUG, dev, format, ##arg)
#else
#define dev_dbg(dev, format, arg...) \
({ \
if (0) \
dev_printk(KERN_DEBUG, dev, format, ##arg); \
0; \
})
#endif
#define dev_level_ratelimited(dev_level, dev, fmt, ...) \ #define dev_level_ratelimited(dev_level, dev, fmt, ...) \
do { \ do { \
static DEFINE_RATELIMIT_STATE(_rs, \ static DEFINE_RATELIMIT_STATE(_rs, \
...@@ -973,33 +999,21 @@ do { \ ...@@ -973,33 +999,21 @@ do { \
dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__) dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)
#define dev_info_ratelimited(dev, fmt, ...) \ #define dev_info_ratelimited(dev, fmt, ...) \
dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__) dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)
#if defined(CONFIG_DYNAMIC_DEBUG) || defined(DEBUG)
#define dev_dbg_ratelimited(dev, fmt, ...) \ #define dev_dbg_ratelimited(dev, fmt, ...) \
dev_level_ratelimited(dev_dbg, dev, fmt, ##__VA_ARGS__) do { \
static DEFINE_RATELIMIT_STATE(_rs, \
/* DEFAULT_RATELIMIT_INTERVAL, \
* Stupid hackaround for existing uses of non-printk uses dev_info DEFAULT_RATELIMIT_BURST); \
* DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
* Note that the definition of dev_info below is actually _dev_info if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \
* and a macro is used to avoid redefining dev_info __ratelimit(&_rs)) \
*/ __dynamic_pr_debug(&descriptor, pr_fmt(fmt), \
##__VA_ARGS__); \
#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
#if defined(CONFIG_DYNAMIC_DEBUG)
#define dev_dbg(dev, format, ...) \
do { \
dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
} while (0) } while (0)
#elif defined(DEBUG)
#define dev_dbg(dev, format, arg...) \
dev_printk(KERN_DEBUG, dev, format, ##arg)
#else #else
#define dev_dbg(dev, format, arg...) \ #define dev_dbg_ratelimited(dev, fmt, ...) \
({ \ no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
if (0) \
dev_printk(KERN_DEBUG, dev, format, ##arg); \
0; \
})
#endif #endif
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment