Commit fbfba9cf15b7d48d0c8e9f7965b351ddc3d59114
Committed by
Jiri Slaby
Jiri Slaby
1 parent
eae433b4f3
Exists in
ti-linux-3.12.y
and in
2 other branches
ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
commit b7a7723513dc89f83d6df13206df55d4dc26e825 upstream. This (widely used) construction: if(printk_ratelimit()) dev_dbg() Causes the ratelimiting to spam the kernel log with the "callbacks suppressed" message below, even while the dev_dbg it is supposed to rate limit wouldn't print anything because DEBUG is not defined for this device. [ 533.803964] retire_playback_urb: 852 callbacks suppressed [ 538.807930] retire_playback_urb: 852 callbacks suppressed [ 543.811897] retire_playback_urb: 852 callbacks suppressed [ 548.815745] retire_playback_urb: 852 callbacks suppressed [ 553.819826] retire_playback_urb: 852 callbacks suppressed So use dev_dbg_ratelimited() instead of this construction. Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
sound/usb/pcm.c
| ... | ... | @@ -1491,9 +1491,9 @@ |
| 1491 | 1491 | * The error should be lower than 2ms since the estimate relies |
| 1492 | 1492 | * on two reads of a counter updated every ms. |
| 1493 | 1493 | */ |
| 1494 | - if (printk_ratelimit() && | |
| 1495 | - abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2) | |
| 1496 | - snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n", | |
| 1494 | + if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2) | |
| 1495 | + dev_dbg_ratelimited(&subs->dev->dev, | |
| 1496 | + "delay: estimated %d, actual %d\n", | |
| 1497 | 1497 | est_delay, subs->last_delay); |
| 1498 | 1498 | |
| 1499 | 1499 | if (!subs->running) { |