openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda: rename sink_eld to hdmi_eld 

Rename struct sink_eld to hdmi_eld.

Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wu Fengguang 2008-11-19 15:14:00 +08:00 committed by Takashi Iwai
parent 4e19c58f27
commit 5b87ebb7a7
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/pci/hda/hda_eld.c
View File

@ -267,7 +267,7 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
/* /*
* Be careful, ELD buf could be totally rubbish! * Be careful, ELD buf could be totally rubbish!
*/ */
static int hdmi_update_sink_eld(struct sink_eld *e, static int hdmi_update_eld(struct hdmi_eld *e,
const unsigned char *buf, int size) const unsigned char *buf, int size)
{ {
int mnl; int mnl;
@ -351,7 +351,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)
AC_DIPSIZE_ELD_BUF); AC_DIPSIZE_ELD_BUF);
} }
int snd_hdmi_get_eld(struct sink_eld *eld, int snd_hdmi_get_eld(struct hdmi_eld *eld,
struct hda_codec *codec, hda_nid_t nid) struct hda_codec *codec, hda_nid_t nid)
{ {
int i; int i;
@ -380,7 +380,7 @@ int snd_hdmi_get_eld(struct sink_eld *eld,
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
buf[i] = hdmi_get_eld_byte(codec, nid, i); buf[i] = hdmi_get_eld_byte(codec, nid, i);
ret = hdmi_update_sink_eld(eld, buf, size); ret = hdmi_update_eld(eld, buf, size);
kfree(buf); kfree(buf);
return ret; return ret;
@ -421,7 +421,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
buf[j] = '\0'; /* necessary when j == 0 */ buf[j] = '\0'; /* necessary when j == 0 */
} }
void snd_hdmi_show_eld(struct sink_eld *e) void snd_hdmi_show_eld(struct hdmi_eld *e)
{ {
int i; int i;
char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
@ -482,7 +482,7 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a,
static void hdmi_print_eld_info(struct snd_info_entry *entry, static void hdmi_print_eld_info(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
struct sink_eld *e = entry->private_data; struct hdmi_eld *e = entry->private_data;
char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
int i; int i;
@ -509,7 +509,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
hdmi_print_sad_info(i, e->sad + i, buffer); hdmi_print_sad_info(i, e->sad + i, buffer);
} }
int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld) int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
{ {
char name[32]; char name[32];
struct snd_info_entry *entry; struct snd_info_entry *entry;

10
sound/pci/hda/hda_local.h
View File

@ -462,7 +462,7 @@ struct cea_sad {
/* /*
* ELD: EDID Like Data * ELD: EDID Like Data
*/ */
struct sink_eld { struct hdmi_eld {
int eld_size; int eld_size;
int baseline_len; int baseline_len;
int eld_ver; /* (eld_ver == 0) indicates invalid ELD */ int eld_ver; /* (eld_ver == 0) indicates invalid ELD */
@ -481,13 +481,13 @@ struct sink_eld {
}; };
int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);
int snd_hdmi_get_eld(struct sink_eld *, struct hda_codec *, hda_nid_t); int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
void snd_hdmi_show_eld(struct sink_eld *eld); void snd_hdmi_show_eld(struct hdmi_eld *eld);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld); int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld);
#else #else
inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld) inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
{ {
return 0; return 0;
} }

8
sound/pci/hda/patch_intelhdmi.c
View File

@ -42,7 +42,7 @@
struct intel_hdmi_spec { struct intel_hdmi_spec {
struct hda_multi_out multiout; struct hda_multi_out multiout;
struct hda_pcm pcm_rec; struct hda_pcm pcm_rec;
struct sink_eld sink; struct hdmi_eld sink_eld;
}; };
static struct hda_verb pinout_enable_verb[] = { static struct hda_verb pinout_enable_verb[] = {
@ -308,7 +308,7 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec)
static void hdmi_parse_eld(struct hda_codec *codec) static void hdmi_parse_eld(struct hda_codec *codec)
{ {
struct intel_hdmi_spec *spec = codec->spec; struct intel_hdmi_spec *spec = codec->spec;
struct sink_eld *eld = &spec->sink; struct hdmi_eld *eld = &spec->sink_eld;
if (!snd_hdmi_get_eld(eld, codec, PIN_NID)) if (!snd_hdmi_get_eld(eld, codec, PIN_NID))
snd_hdmi_show_eld(eld); snd_hdmi_show_eld(eld);
@ -411,7 +411,7 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec,
struct hdmi_audio_infoframe *ai) struct hdmi_audio_infoframe *ai)
{ {
struct intel_hdmi_spec *spec = codec->spec; struct intel_hdmi_spec *spec = codec->spec;
struct sink_eld *eld = &spec->sink; struct hdmi_eld *eld = &spec->sink_eld;
int i; int i;
int spk_mask = 0; int spk_mask = 0;
int channels = 1 + (ai->CC02_CT47 & 0x7); int channels = 1 + (ai->CC02_CT47 & 0x7);
@ -663,7 +663,7 @@ static int patch_intel_hdmi(struct hda_codec *codec)
codec->spec = spec; codec->spec = spec;
codec->patch_ops = intel_hdmi_patch_ops; codec->patch_ops = intel_hdmi_patch_ops;
snd_hda_eld_proc_new(codec, &spec->sink); snd_hda_eld_proc_new(codec, &spec->sink_eld);
init_channel_allocations(); init_channel_allocations();