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

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

sound/core/misc.c

+9 −4
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ void __snd_printk(unsigned int level, const char *path, int line, 
{

	va_list args;

#ifdef CONFIG_SND_VERBOSE_PRINTK

	int kern_level;

	struct va_format vaf;

	char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";

#endif
@@ -81,12 +82,16 @@ void __snd_printk(unsigned int level, const char *path, int line, 
#ifdef CONFIG_SND_VERBOSE_PRINTK

	vaf.fmt = format;

	vaf.va = &args;

	if (format[0] == '<' && format[2] == '>') {

		memcpy(verbose_fmt, format, 3);

		vaf.fmt = format + 3;



	kern_level = printk_get_level(format);

	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)

		memcpy(verbose_fmt, KERN_DEBUG, 3);

		memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);

	printk(verbose_fmt, sanity_file_name(path), line, &vaf);



#else

	vprintk(format, args);

#endif