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

Commit fae3d88a authored by Fengguang Wu's avatar Fengguang Wu Committed by Takashi Iwai
Browse files

ALSA: hda - hide HDMI/ELD printks unless snd.debug=2 



Also remove two warnings when CONFIG_SND_DEBUG is not set:

sound/pci/hda/patch_hdmi.c: In function ‘hdmi_intrinsic_event’:
sound/pci/hda/patch_hdmi.c:761:6: warning: unused variable ‘eldv’ [-Wunused-variable]
sound/pci/hda/patch_hdmi.c:760:6: warning: unused variable ‘pd’ [-Wunused-variable]

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 38be95dd

include/sound/core.h

+10 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ void release_and_free_resource(struct resource *res); 


/* --- */



/* sound printk debug levels */

enum {

	SND_PR_ALWAYS,

	SND_PR_DEBUG,

	SND_PR_VERBOSE,

};



#if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK)

__printf(4, 5)

void __snd_printk(unsigned int level, const char *file, int line,
@@ -354,6 +361,8 @@ void __snd_printk(unsigned int level, const char *file, int line, 
 */

#define snd_printd(fmt, args...) \

	__snd_printk(1, __FILE__, __LINE__, fmt, ##args)

#define _snd_printd(level, fmt, args...) \

	__snd_printk(level, __FILE__, __LINE__, fmt, ##args)



/**

 * snd_BUG - give a BUG warning message and stack trace
@@ -383,6 +392,7 @@ void __snd_printk(unsigned int level, const char *file, int line, 
#else /* !CONFIG_SND_DEBUG */



#define snd_printd(fmt, args...)	do { } while (0)

#define _snd_printd(level, fmt, args...) do { } while (0)

#define snd_BUG()			do { } while (0)

static inline int __snd_bug_on(int cond)

{

sound/pci/hda/hda_eld.c

+3 −3
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) 
	else

		buf2[0] = '\0';



	printk(KERN_INFO "HDMI: supports coding type %s:"

	_snd_printd(SND_PR_VERBOSE, "HDMI: supports coding type %s:"

			" channels = %d, rates =%s%s\n",

			cea_audio_coding_type_names[a->format],

			a->channels,
@@ -442,14 +442,14 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) 
{

	int i;



	printk(KERN_INFO "HDMI: detected monitor %s at connection type %s\n",

	_snd_printd(SND_PR_VERBOSE, "HDMI: detected monitor %s at connection type %s\n",

			e->monitor_name,

			eld_connection_type_names[e->conn_type]);



	if (e->spk_alloc) {

		char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];

		snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));

		printk(KERN_INFO "HDMI: available speakers:%s\n", buf);

		_snd_printd(SND_PR_VERBOSE, "HDMI: available speakers:%s\n", buf);

	}



	for (i = 0; i < e->sad_count; i++)

sound/pci/hda/patch_hdmi.c

+4 −5
Original line number Diff line number Diff line
@@ -757,8 +757,6 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) 
	struct hdmi_spec *spec = codec->spec;

	int tag = res >> AC_UNSOL_RES_TAG_SHIFT;

	int pin_nid;

	int pd = !!(res & AC_UNSOL_RES_PD);

	int eldv = !!(res & AC_UNSOL_RES_ELDV);

	int pin_idx;

	struct hda_jack_tbl *jack;
@@ -768,9 +766,10 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) 
	pin_nid = jack->nid;

	jack->jack_dirty = 1;



	printk(KERN_INFO

	_snd_printd(SND_PR_VERBOSE,

		"HDMI hot plug event: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",

		codec->addr, pin_nid, pd, eldv);

		codec->addr, pin_nid,

		!!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV));



	pin_idx = pin_nid_to_pin_index(spec, pin_nid);

	if (pin_idx < 0)
@@ -992,7 +991,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) 
	if (eld->monitor_present)

		eld_valid	= !!(present & AC_PINSENSE_ELDV);



	printk(KERN_INFO

	_snd_printd(SND_PR_VERBOSE,

		"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",

		codec->addr, pin_nid, eld->monitor_present, eld_valid);