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

Commit dd74b465 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Build hda_eld into snd-hda-codec module 



Now two modules require hda_eld.o, so we need to put it to the common
place instead of building into two individual modules.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 25045705

sound/pci/hda/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ snd-hda-intel-objs := hda_intel.o 
snd-hda-codec-y := hda_codec.o

snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

# snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o

snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -17,8 +17,8 @@ snd-hda-codec-cirrus-objs := patch_cirrus.o 
snd-hda-codec-ca0110-objs :=	patch_ca0110.o

snd-hda-codec-conexant-objs :=	patch_conexant.o

snd-hda-codec-via-objs :=	patch_via.o

snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o hda_eld.o

snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o hda_eld.o

snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o

snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o



# common driver

obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o

sound/pci/hda/hda_eld.c

+6 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) 
	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,

						 AC_DIPSIZE_ELD_BUF);

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size);



int snd_hdmi_get_eld(struct hdmi_eld *eld,

		     struct hda_codec *codec, hda_nid_t nid)
@@ -366,6 +367,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 
	kfree(buf);

	return ret;

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld);



static void hdmi_show_short_audio_desc(struct cea_sad *a)

{
@@ -404,6 +406,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) 
	}

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

}

EXPORT_SYMBOL_HDA(snd_print_channel_allocation);



void snd_hdmi_show_eld(struct hdmi_eld *e)

{
@@ -422,6 +425,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) 
	for (i = 0; i < e->sad_count; i++)

		hdmi_show_short_audio_desc(e->sad + i);

}

EXPORT_SYMBOL_HDA(snd_hdmi_show_eld);



#ifdef CONFIG_PROC_FS
@@ -580,6 +584,7 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, 


	return 0;

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new);



void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)

{
@@ -588,5 +593,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) 
		eld->proc_entry = NULL;

	}

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);



#endif /* CONFIG_PROC_FS */