From: Tim Gardner Subject: [PATCH 3.11-rc5 1/2] ALSA: pcm: Add snd_printd_ratelimit() Date: Fri, 16 Aug 2013 11:18:59 -0600 Message-ID: <1376673540-2201-1-git-send-email-tim.gardner@canonical.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Tim Gardner , Jaroslav Kysela , Takashi Iwai , Pierre-Louis Bossart , Lars-Peter Clausen , Yacine Belkadi List-Id: alsa-devel@alsa-project.org Direct calls to printk_limit() will emit log noise even when CONFIG_SND_DEBUG is not defined. Add a wrapper macro around printk_limit() that is conditionally defined by CONFIG_SND_DEBUG. Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Pierre-Louis Bossart Cc: Lars-Peter Clausen Cc: Yacine Belkadi Signed-off-by: Tim Gardner --- checkpatch is moaning about the use of printk_ratelimit(), but printk_ratelimited() seems like overkill for a debug feature. WARNING: Prefer printk_ratelimited or pr__ratelimited to printk_ratelimit #38: FILE: include/sound/core.h:382: +#define snd_printd_ratelimit() printk_ratelimit() include/sound/core.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/sound/core.h b/include/sound/core.h index c586617..2a14f1f 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -27,6 +27,7 @@ #include /* struct rw_semaphore */ #include /* pm_message_t */ #include +#include /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS @@ -376,6 +377,11 @@ void __snd_printk(unsigned int level, const char *file, int line, #define snd_BUG() WARN(1, "BUG?\n") /** + * Suppress high rates of output when CONFIG_SND_DEBUG is enabled. + */ +#define snd_printd_ratelimit() printk_ratelimit() + +/** * snd_BUG_ON - debugging check macro * @cond: condition to evaluate * @@ -398,6 +404,8 @@ static inline void _snd_printd(int level, const char *format, ...) {} unlikely(__ret_warn_on); \ }) +static inline bool snd_printd_ratelimit(void) { return false; } + #endif /* CONFIG_SND_DEBUG */ #ifdef CONFIG_SND_DEBUG_VERBOSE -- 1.7.9.5