ALSA: hda - hdmi: Refactor hdmi_eld into parsed_hdmi_eld

For better readability, the information that is parsed out of the
ELD data is now put into a separate parsed_hdmi_eld struct.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 17 insertions, 10 deletions

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 05f1d594d17b..363cd487266b 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -713,10 +713,10 @@ struct cea_sad {
 /*
  * ELD: EDID Like Data
  */
-struct hdmi_eld {
-        bool    monitor_present;
-        bool    eld_valid;
-        int     eld_size;
+struct parsed_hdmi_eld {
+        /*
+         * all fields will be cleared before updating ELD
+         */
         int     baseline_len;
         int     eld_ver;
         int     cea_edid_ver;
@@ -731,19 +731,26 @@ struct hdmi_eld {
         int     spk_alloc;
         int     sad_count;
         struct cea_sad sad[ELD_MAX_SAD];
-        /*
-         * all fields above eld_buffer will be cleared before updating ELD
-         */
+};
+
+struct hdmi_eld {
+        bool    monitor_present;
+        bool    eld_valid;
+        int     eld_size;
         char    eld_buffer[ELD_MAX_SIZE];
+        struct parsed_hdmi_eld info;
 #ifdef CONFIG_PROC_FS
         struct snd_info_entry *proc_entry;
 #endif
 };
 
 int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);
-int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
-void snd_hdmi_show_eld(struct hdmi_eld *eld);
-void snd_hdmi_eld_update_pcm_info(struct hdmi_eld *eld,
+int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,
+                     unsigned char *buf, int *eld_size);
+int snd_hdmi_parse_eld(struct parsed_hdmi_eld *e,
+                       const unsigned char *buf, int size);
+void snd_hdmi_show_eld(struct parsed_hdmi_eld *e);
+void snd_hdmi_eld_update_pcm_info(struct parsed_hdmi_eld *e,
                               struct hda_pcm_stream *hinfo);
 
 #ifdef CONFIG_PROC_FS