drm/i915: Reorganize intel_lpe_audio_notify() arguments

Shuffle the arguments to intel_lpe_audio_notify() around a bit. Pipe
and port being the most important things, so let's put the first, and
thre rest can come in as is. Also constify the eld argument.

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-8-ville.syrjala@linux.intel.com
Reviewed-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 38b6bf9f4dc222aa9bb09cae27e115a6bc73ed1a..b20ed16da0ada9c7a409657e079ead2315d391e4 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3721,8 +3721,8 @@ int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
-                           void *eld, int port, int pipe, int ls_clock,
-                           bool dp_output);
+                           enum pipe pipe, enum port port,
+                           const void *eld, int ls_clock, bool dp_output);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 79eeef25321f415456b9adadadf598d4fa982ebb..d805b6e6fe71467ed4f9a85a74fdba1b5ed81998 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -632,7 +632,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
                                                 (int) port, (int) pipe);
        }
 
-       intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe,
+       intel_lpe_audio_notify(dev_priv, pipe, port, connector->eld,
                               crtc_state->port_clock,
                               intel_encoder->type == INTEL_OUTPUT_DP);
 }
@@ -669,7 +669,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
                                                 (int) port, (int) pipe);
        }
 
-       intel_lpe_audio_notify(dev_priv, NULL, port, pipe, 0, false);
+       intel_lpe_audio_notify(dev_priv, pipe, port, NULL, 0, false);
 }
 
 /**

diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index 7fd95733eff55236dacb795d0efa240fd89167ab..4c770d037f237acbba169b450b57421f3bb534e6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/intel_lpe_audio.c
@@ -307,17 +307,17 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
  * intel_lpe_audio_notify() - notify lpe audio event
  * audio driver and i915
  * @dev_priv: the i915 drm device private data
+ * @pipe: pipe
+ * @port: port
  * @eld : ELD data
- * @pipe: pipe id
- * @port: port id
  * @ls_clock: Link symbol clock in kHz
  * @dp_output: Driving a DP output?
  *
  * Notify lpe audio driver of eld change.
  */
 void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
-                           void *eld, int port, int pipe, int ls_clock,
-                           bool dp_output)
+                           enum pipe pipe, enum port port,
+                           const void *eld, int ls_clock, bool dp_output)
 {
        unsigned long irq_flags;
        struct intel_hdmi_lpe_audio_pdata *pdata = NULL;