Commit b778b3f2 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

sound: use printk_get_level and printk_skip_level



Make the output logging routine independent of the KERN_<LEVEL> style.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 533574c6
...@@ -68,6 +68,7 @@ void __snd_printk(unsigned int level, const char *path, int line, ...@@ -68,6 +68,7 @@ void __snd_printk(unsigned int level, const char *path, int line,
{ {
va_list args; va_list args;
#ifdef CONFIG_SND_VERBOSE_PRINTK #ifdef CONFIG_SND_VERBOSE_PRINTK
int kern_level;
struct va_format vaf; struct va_format vaf;
char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV"; char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
#endif #endif
...@@ -81,12 +82,16 @@ void __snd_printk(unsigned int level, const char *path, int line, ...@@ -81,12 +82,16 @@ void __snd_printk(unsigned int level, const char *path, int line,
#ifdef CONFIG_SND_VERBOSE_PRINTK #ifdef CONFIG_SND_VERBOSE_PRINTK
vaf.fmt = format; vaf.fmt = format;
vaf.va = &args; vaf.va = &args;
if (format[0] == '<' && format[2] == '>') {
memcpy(verbose_fmt, format, 3); kern_level = printk_get_level(format);
vaf.fmt = format + 3; if (kern_level) {
const char *end_of_header = printk_skip_level(format);
memcpy(verbose_fmt, format, end_of_header - format);
vaf.fmt = end_of_header;
} else if (level) } else if (level)
memcpy(verbose_fmt, KERN_DEBUG, 3); memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
printk(verbose_fmt, sanity_file_name(path), line, &vaf); printk(verbose_fmt, sanity_file_name(path), line, &vaf);
#else #else
vprintk(format, args); vprintk(format, args);
#endif #endif
......
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