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

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

ALSA: hda: minor output message cleanups 



Some minor user visible message cleanups.

Signed-off-by: default avatarWu Fengguang <wfg@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5b87ebb7

sound/pci/hda/hda_eld.c

+6 −9
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static char *cea_audio_coding_type_names[] = { 
	/*  6 */ "AAC-LC",

	/*  7 */ "DTS",

	/*  8 */ "ATRAC",

	/*  9 */ "DSD (1-bit audio)",

	/*  9 */ "DSD (One Bit Audio)",

	/* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)",

	/* 11 */ "DTS-HD",

	/* 12 */ "MLP (Dolby TrueHD)",
@@ -395,7 +395,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) 
	printk(KERN_INFO "channels: %d\n", a->channels);



	snd_print_pcm_rates(a->rates, buf, sizeof(buf));

	printk(KERN_INFO "sampling frequencies: %s\n", buf);

	printk(KERN_INFO "sampling rates: %s\n", buf);



	if (a->format == AUDIO_CODING_TYPE_LPCM)

		printk(KERN_INFO "sample bits: 0x%x\n", a->sample_bits);
@@ -416,8 +416,6 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) 
			j += snprintf(buf + j, buflen - j,  " %s",

					cea_speaker_allocation_names[i]);

	}

	if (j)

		j--;	/* skip last space */

	buf[j] = '\0';	/* necessary when j == 0 */

}
@@ -464,11 +462,10 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a, 
	snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a->channels);



	snd_print_pcm_rates(a->rates, buf, sizeof(buf));

	snd_iprintf(buffer, "sad%d_sampling_rates\t[0x%x] %s\n",

			i, a->rates, buf);

	snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a->rates, buf);



	if (a->format == AUDIO_CODING_TYPE_LPCM)

		snd_iprintf(buffer, "sad%d_sample_bits\t0x%x\n",

		snd_iprintf(buffer, "sad%d_bits\t\t0x%x\n",

							i, a->sample_bits);



	if (a->max_bitrate)