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

Commit 74d779ab authored by Tim Gardner's avatar Tim Gardner Committed by Takashi Iwai
Browse files

ALSA: pcm: Use snd_printd_ratelimit() 



The use of snd_printd_ratelimit() supresses superfluous output from
printk_ratelimit() when CONFIG_SND_DEBUG is not defined. For example,

[   43.753692] snd_pcm_update_hw_ptr0: 26 callbacks suppressed
[   48.822131] snd_pcm_update_hw_ptr0: 25 callbacks suppressed
[   53.894953] snd_pcm_update_hw_ptr0: 25 callbacks suppressed
[   58.997761] snd_pcm_update_hw_ptr0: 25 callbacks suppressed
[   64.100952] snd_pcm_update_hw_ptr0: 25 callbacks suppressed

fills the log even when no debug output is actually produced.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Yacine Belkadi <yacine.belkadi.1@gmail.com>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bcbb1553

sound/core/pcm_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void xrun(struct snd_pcm_substream *substream) 
	do {								\

		if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {		\

			xrun_log_show(substream);			\

			if (printk_ratelimit()) {			\

			if (snd_printd_ratelimit()) {			\

				snd_printd("PCM: " fmt, ##args);	\

			}						\

			dump_stack_on_xrun(substream);			\
@@ -342,7 +342,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		return -EPIPE;

	}

	if (pos >= runtime->buffer_size) {

		if (printk_ratelimit()) {

		if (snd_printd_ratelimit()) {

			char name[16];

			snd_pcm_debug_name(substream, name, sizeof(name));

			xrun_log_show(substream);