diff mbox

[Trusty,SRU] UBUNTU: SAUCE: (no-up) ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()

Message ID 1397063368-28716-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner April 9, 2014, 5:09 p.m. UTC
(upstreaming alternate patch)

BugLink: http://bugs.launchpad.net/bugs/1305133

Malfunctioning or slow devices can cause a flood of dmesg SPAM.

I've ignored checkpatch.pl complaints about the use of printk_ratelimit() in favour
of prior art in sound/usb/pcm.c.

WARNING: Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit
+	if (printk_ratelimit() &&

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 sound/usb/pcm.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Stefan Bader April 10, 2014, 7:26 a.m. UTC | #1
Looks reasonable safe. Not sure about the background of the checkpatch warning
but I can Andy about that. :)
And missing some of these messages should be no problem either.

-Stefan
Seth Forshee April 10, 2014, 12:37 p.m. UTC | #2

Tim Gardner April 10, 2014, 1:35 p.m. UTC | #3
Upstreamed patch applied also.

At Wed,  9 Apr 2014 11:30:44 -0600,
Tim Gardner wrote:
 >
 > BugLink: http://bugs.launchpad.net/bugs/1305133
 >
 > Malfunctioning or slow devices can cause a flood of dmesg SPAM.
 >
 > I've ignored checkpatch.pl complaints about the use of 
printk_ratelimit() in favour
 > of prior art in sound/usb/pcm.c.
 >
 > WARNING: Prefer printk_ratelimited or pr_<level>_ratelimited to 
printk_ratelimit
 > +	if (printk_ratelimit() &&
 >
 > Cc: Jaroslav Kysela <perex@perex.cz>
 > Cc: Takashi Iwai <tiwai@suse.de>
 > Cc: Eldad Zack <eldad@fogrefinery.com>
 > Cc: Daniel Mack <zonque@gmail.com>
 > Cc: Clemens Ladisch <clemens@ladisch.de>
 > Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Applied, thanks.


Takashi
diff mbox

Patch

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index ca3256d..7bfa7a1 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1487,7 +1487,8 @@  static void retire_playback_urb(struct snd_usb_substream *subs,
 	 * The error should be lower than 2ms since the estimate relies
 	 * on two reads of a counter updated every ms.
 	 */
-	if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
+	if (printk_ratelimit() &&
+	    abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
 		snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n",
 			est_delay, subs->last_delay);