提交 06f69d17 编写于 作者: W Wu Fengguang 提交者: Takashi Iwai

ALSA: hda: minor output message cleanups

Some minor user visible message cleanups.
Signed-off-by: NWu Fengguang <wfg@linux.intel.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 5b87ebb7
...@@ -118,7 +118,7 @@ static char *cea_audio_coding_type_names[] = { ...@@ -118,7 +118,7 @@ static char *cea_audio_coding_type_names[] = {
/* 6 */ "AAC-LC", /* 6 */ "AAC-LC",
/* 7 */ "DTS", /* 7 */ "DTS",
/* 8 */ "ATRAC", /* 8 */ "ATRAC",
/* 9 */ "DSD (1-bit audio)", /* 9 */ "DSD (One Bit Audio)",
/* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)", /* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)",
/* 11 */ "DTS-HD", /* 11 */ "DTS-HD",
/* 12 */ "MLP (Dolby TrueHD)", /* 12 */ "MLP (Dolby TrueHD)",
...@@ -395,7 +395,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) ...@@ -395,7 +395,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
printk(KERN_INFO "channels: %d\n", a->channels); printk(KERN_INFO "channels: %d\n", a->channels);
snd_print_pcm_rates(a->rates, buf, sizeof(buf)); 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) if (a->format == AUDIO_CODING_TYPE_LPCM)
printk(KERN_INFO "sample bits: 0x%x\n", a->sample_bits); printk(KERN_INFO "sample bits: 0x%x\n", a->sample_bits);
...@@ -413,11 +413,9 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) ...@@ -413,11 +413,9 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
for (i = 0, j = 0; i < ARRAY_SIZE(cea_speaker_allocation_names); i++) { for (i = 0, j = 0; i < ARRAY_SIZE(cea_speaker_allocation_names); i++) {
if (spk_alloc & (1 << i)) if (spk_alloc & (1 << i))
j += snprintf(buf + j, buflen - j, "%s ", j += snprintf(buf + j, buflen - j, " %s",
cea_speaker_allocation_names[i]); cea_speaker_allocation_names[i]);
} }
if (j)
j--; /* skip last space */
buf[j] = '\0'; /* necessary when j == 0 */ buf[j] = '\0'; /* necessary when j == 0 */
} }
...@@ -464,11 +462,10 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a, ...@@ -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_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a->channels);
snd_print_pcm_rates(a->rates, buf, sizeof(buf)); snd_print_pcm_rates(a->rates, buf, sizeof(buf));
snd_iprintf(buffer, "sad%d_sampling_rates\t[0x%x] %s\n", snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a->rates, buf);
i, a->rates, buf);
if (a->format == AUDIO_CODING_TYPE_LPCM) 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); i, a->sample_bits);
if (a->max_bitrate) if (a->max_bitrate)
...@@ -501,7 +498,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry, ...@@ -501,7 +498,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay); snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay);
snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
snd_iprintf(buffer, "speakers\t\t[0x%x] %s\n", e->spk_alloc, buf); snd_iprintf(buffer, "speakers\t\t[0x%x]%s\n", e->spk_alloc, buf);
snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count); snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册