drm/i915: Drop port_mst_index parameter from pin/eld callback

The port_mst_index parameter was reserved for future use, but
maintainers prefer to add it later when it is actually used.

[Note: this is an update patch to commit [51e1d83cab99: drm/i915: Call
 audio pin/ELD notify function] where I mistakenly applied the older
 version.  Jani and Daniel's review tags were to the latest version,
 so I add them below, too -- tiwai]

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 969835db8ff700a3aa5c4187348c7833d825a8b9..2d52d96b549385fa2966b92ee5a4c5338126c44b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -424,7 +424,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
                dev_priv->display.audio_codec_enable(connector, intel_encoder, mode);
 
        if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
-               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port, 0);
+               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
 }
 
 /**
@@ -447,7 +447,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
                dev_priv->display.audio_codec_disable(intel_encoder);
 
        if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
-               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port, 0);
+               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
 }
 
 /**

diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index ab5bde3736b423d0196ae8ca7bf07577bbe32131..b2d56dd483d9c8ad197b6a59071c2dd2378652da 100644 (file)
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -42,9 +42,8 @@ struct i915_audio_component {
                 * pin sense and/or ELD information has changed.
                 * @audio_ptr:          HDA driver object
                 * @port:               Which port has changed (PORTA / PORTB / PORTC etc)
-                * @port_mst_index:     Index within that port, for DisplayPort multistreaming
                 */
-               void (*pin_eld_notify)(void *audio_ptr, int port, int port_mst_index);
+               void (*pin_eld_notify)(void *audio_ptr, int port);
        } *audio_ops;
 };
 

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 932292ce5ce75233d1f9fe80d1b1ba1cd6d0b487..acbfbe087ee86d41f5688b0af85c4ee6f7eec43f 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2324,7 +2324,7 @@ static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg,
        snd_hda_codec_set_power_to_all(codec, fg, power_state);
 }
 
-static void intel_pin_eld_notify(void *audio_ptr, int port, int port_mst_index)
+static void intel_pin_eld_notify(void *audio_ptr, int port)
 {
        struct hda_codec *codec = audio_ptr;
        int pin_nid = port + 0x04;