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

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

ALSA: hda: rename sink_eld to hdmi_eld 



Rename struct sink_eld to hdmi_eld.

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

sound/pci/hda/hda_eld.c

+7 −7
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a, 
/*

 * 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)

{

	int mnl;
@@ -351,7 +351,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) 
						 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)

{

	int i;
@@ -380,7 +380,7 @@ int snd_hdmi_get_eld(struct sink_eld *eld, 
	for (i = 0; i < size; 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);

	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 */

}



void snd_hdmi_show_eld(struct sink_eld *e)

void snd_hdmi_show_eld(struct hdmi_eld *e)

{

	int i;

	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,

				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];

	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);

}



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];

	struct snd_info_entry *entry;

sound/pci/hda/hda_local.h

+5 −5
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ struct cea_sad { 
/*

 * ELD: EDID Like Data

 */

struct sink_eld {

struct hdmi_eld {

	int	eld_size;

	int	baseline_len;

	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(struct sink_eld *, struct hda_codec *, hda_nid_t);

void snd_hdmi_show_eld(struct sink_eld *eld);

int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);

void snd_hdmi_show_eld(struct hdmi_eld *eld);



#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

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;

}

sound/pci/hda/patch_intelhdmi.c

+4 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
struct intel_hdmi_spec {

	struct hda_multi_out multiout;

	struct hda_pcm pcm_rec;

	struct sink_eld sink;

	struct hdmi_eld sink_eld;

};



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)

{

	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))

		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 intel_hdmi_spec *spec = codec->spec;

	struct sink_eld *eld = &spec->sink;

	struct hdmi_eld *eld = &spec->sink_eld;

	int i;

	int spk_mask = 0;

	int channels = 1 + (ai->CC02_CT47 & 0x7);
@@ -663,7 +663,7 @@ static int patch_intel_hdmi(struct hda_codec *codec) 
	codec->spec = spec;

	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();