aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_eld.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/hda_eld.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/hda_eld.c')
-rw-r--r--sound/pci/hda/hda_eld.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index da08ddaef4fc..1b3ec1e7f268 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -267,8 +267,8 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
267/* 267/*
268 * Be careful, ELD buf could be totally rubbish! 268 * Be careful, ELD buf could be totally rubbish!
269 */ 269 */
270static int hdmi_update_sink_eld(struct sink_eld *e, 270static int hdmi_update_eld(struct hdmi_eld *e,
271 const unsigned char *buf, int size) 271 const unsigned char *buf, int size)
272{ 272{
273 int mnl; 273 int mnl;
274 int i; 274 int i;
@@ -351,7 +351,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)
351 AC_DIPSIZE_ELD_BUF); 351 AC_DIPSIZE_ELD_BUF);
352} 352}
353 353
354int snd_hdmi_get_eld(struct sink_eld *eld, 354int snd_hdmi_get_eld(struct hdmi_eld *eld,
355 struct hda_codec *codec, hda_nid_t nid) 355 struct hda_codec *codec, hda_nid_t nid)
356{ 356{
357 int i; 357 int i;
@@ -380,7 +380,7 @@ int snd_hdmi_get_eld(struct sink_eld *eld,
380 for (i = 0; i < size; i++) 380 for (i = 0; i < size; i++)
381 buf[i] = hdmi_get_eld_byte(codec, nid, i); 381 buf[i] = hdmi_get_eld_byte(codec, nid, i);
382 382
383 ret = hdmi_update_sink_eld(eld, buf, size); 383 ret = hdmi_update_eld(eld, buf, size);
384 384
385 kfree(buf); 385 kfree(buf);
386 return ret; 386 return ret;
@@ -421,7 +421,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
421 buf[j] = '\0'; /* necessary when j == 0 */ 421 buf[j] = '\0'; /* necessary when j == 0 */
422} 422}
423 423
424void snd_hdmi_show_eld(struct sink_eld *e) 424void snd_hdmi_show_eld(struct hdmi_eld *e)
425{ 425{
426 int i; 426 int i;
427 char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; 427 char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
@@ -482,7 +482,7 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a,
482static void hdmi_print_eld_info(struct snd_info_entry *entry, 482static void hdmi_print_eld_info(struct snd_info_entry *entry,
483 struct snd_info_buffer *buffer) 483 struct snd_info_buffer *buffer)
484{ 484{
485 struct sink_eld *e = entry->private_data; 485 struct hdmi_eld *e = entry->private_data;
486 char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; 486 char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
487 int i; 487 int i;
488 488
@@ -509,7 +509,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
509 hdmi_print_sad_info(i, e->sad + i, buffer); 509 hdmi_print_sad_info(i, e->sad + i, buffer);
510} 510}
511 511
512int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld) 512int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
513{ 513{
514 char name[32]; 514 char name[32];
515 struct snd_info_entry *entry; 515 struct snd_info_entry *entry;