aboutsummaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2015-09-03 11:51:34 +0200
committerTakashi Iwai <tiwai@suse.de>2015-09-03 12:09:03 +0200
commitf0675d4a8ed9d3e863ff611561ee0944969a2784 (patch)
treef6519722bfec46cd67104a5ec2ed661e990ed148 /include/drm
parent6869de380e8c11c31b608bb2502dcacd634eda13 (diff)
downloadlinux-linaro-stable-f0675d4a8ed9d3e863ff611561ee0944969a2784.tar.gz
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>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/i915_component.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index ab5bde3736b4..b2d56dd483d9 100644
--- 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;
};