aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_intelhdmi.c
diff options
context:
space:
mode:
authorWu Fengguang <wfg@linux.intel.com>2008-11-19 02:14:00 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-19 03:42:07 -0500
commit5b87ebb7a79455358c1910f2896112ac0fa0d0fa (patch)
tree820b1946f117ecf995a6e0b2636bc86976f1c523 /sound/pci/hda/patch_intelhdmi.c
parent4e19c58f27af67735d64d9af0b184181cea7ca63 (diff)
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>
Diffstat (limited to 'sound/pci/hda/patch_intelhdmi.c')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 459b04576de1..5393f84f6755 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -42,7 +42,7 @@
42struct intel_hdmi_spec { 42struct intel_hdmi_spec {
43 struct hda_multi_out multiout; 43 struct hda_multi_out multiout;
44 struct hda_pcm pcm_rec; 44 struct hda_pcm pcm_rec;
45 struct sink_eld sink; 45 struct hdmi_eld sink_eld;
46}; 46};
47 47
48static struct hda_verb pinout_enable_verb[] = { 48static struct hda_verb pinout_enable_verb[] = {
@@ -308,7 +308,7 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec)
308static void hdmi_parse_eld(struct hda_codec *codec) 308static void hdmi_parse_eld(struct hda_codec *codec)
309{ 309{
310 struct intel_hdmi_spec *spec = codec->spec; 310 struct intel_hdmi_spec *spec = codec->spec;
311 struct sink_eld *eld = &spec->sink; 311 struct hdmi_eld *eld = &spec->sink_eld;
312 312
313 if (!snd_hdmi_get_eld(eld, codec, PIN_NID)) 313 if (!snd_hdmi_get_eld(eld, codec, PIN_NID))
314 snd_hdmi_show_eld(eld); 314 snd_hdmi_show_eld(eld);
@@ -411,7 +411,7 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec,
411 struct hdmi_audio_infoframe *ai) 411 struct hdmi_audio_infoframe *ai)
412{ 412{
413 struct intel_hdmi_spec *spec = codec->spec; 413 struct intel_hdmi_spec *spec = codec->spec;
414 struct sink_eld *eld = &spec->sink; 414 struct hdmi_eld *eld = &spec->sink_eld;
415 int i; 415 int i;
416 int spk_mask = 0; 416 int spk_mask = 0;
417 int channels = 1 + (ai->CC02_CT47 & 0x7); 417 int channels = 1 + (ai->CC02_CT47 & 0x7);
@@ -663,7 +663,7 @@ static int patch_intel_hdmi(struct hda_codec *codec)
663 codec->spec = spec; 663 codec->spec = spec;
664 codec->patch_ops = intel_hdmi_patch_ops; 664 codec->patch_ops = intel_hdmi_patch_ops;
665 665
666 snd_hda_eld_proc_new(codec, &spec->sink); 666 snd_hda_eld_proc_new(codec, &spec->sink_eld);
667 667
668 init_channel_allocations(); 668 init_channel_allocations();
669 669