drm/i915: Clean up the LPE audio platform data

Split the LPE audio platform data into a port specific
chunk and device specific chunk. Eventually we'll have
a port specific chunk for each port, but for now we'll
stick to just one.

We'll also get rid of the intel_hdmi_lpe_audio_eld structure
which doesn't seem to have any real reason to exist.

v2: Organize per port instead of per pipe

Cc: Takashi Iwai <tiwai@suse.de>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170427160231.13337-9-ville.syrjala@linux.intel.com
Reviewed-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 9 insertions, 10 deletions

diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 1a095189db83..c2b78621852e 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1556,21 +1556,20 @@ static void had_audio_wq(struct work_struct *work)
         struct snd_intelhad *ctx =
                 container_of(work, struct snd_intelhad, hdmi_audio_wq);
         struct intel_hdmi_lpe_audio_pdata *pdata = ctx->dev->platform_data;
+        struct intel_hdmi_lpe_audio_port_pdata *ppdata = &pdata->port;
 
         pm_runtime_get_sync(ctx->dev);
         mutex_lock(&ctx->mutex);
-        if (pdata->pipe < 0) {
+        if (ppdata->pipe < 0) {
                 dev_dbg(ctx->dev, "%s: Event: HAD_NOTIFY_HOT_UNPLUG\n",
                         __func__);
                 memset(ctx->eld, 0, sizeof(ctx->eld)); /* clear the old ELD */
                 had_process_hot_unplug(ctx);
         } else {
-                struct intel_hdmi_lpe_audio_eld *eld = &pdata->eld;
-
                 dev_dbg(ctx->dev, "%s: HAD_NOTIFY_ELD : port = %d, tmds = %d\n",
-                        __func__, eld->port_id, pdata->ls_clock);
+                        __func__, ppdata->port, ppdata->ls_clock);
 
-                switch (pdata->pipe) {
+                switch (ppdata->pipe) {
                 case 0:
                         ctx->had_config_offset = AUDIO_HDMI_CONFIG_A;
                         break;
@@ -1582,18 +1581,18 @@ static void had_audio_wq(struct work_struct *work)
                         break;
                 default:
                         dev_dbg(ctx->dev, "Invalid pipe %d\n",
-                                pdata->pipe);
+                                ppdata->pipe);
                         break;
                 }
 
-                memcpy(ctx->eld, eld->eld_data, sizeof(ctx->eld));
+                memcpy(ctx->eld, ppdata->eld, sizeof(ctx->eld));
 
-                ctx->dp_output = pdata->dp_output;
+                ctx->dp_output = ppdata->dp_output;
                 if (ctx->dp_output) {
                         ctx->tmds_clock_speed = 0;
-                        ctx->link_rate = pdata->ls_clock;
+                        ctx->link_rate = ppdata->ls_clock;
                 } else {
-                        ctx->tmds_clock_speed = pdata->ls_clock;
+                        ctx->tmds_clock_speed = ppdata->ls_clock;
                         ctx->link_rate = 0;
                 }