drm/i915/dp: Use a local variable for intel_encoder *

We have two cases of intel_dp to intel_encoder conversions, use a
local variable to store the conversion.

Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927205735.16651-3-dhinakaran.pandiyan@intel.com

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 4e0870f..5c03758 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5017,6 +5017,7 @@ intel_dp_long_pulse(struct intel_connector *connector,
 {
        struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        struct intel_dp *intel_dp = intel_attached_dp(&connector->base);
+       struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
        enum drm_connector_status status;
        u8 sink_irq_vector = 0;
 
@@ -5027,7 +5028,7 @@ intel_dp_long_pulse(struct intel_connector *connector,
        /* Can't disconnect eDP */
        if (intel_dp_is_edp(intel_dp))
                status = edp_detect(intel_dp);
-       else if (intel_digital_port_connected(&dp_to_dig_port(intel_dp)->base))
+       else if (intel_digital_port_connected(encoder))
                status = intel_dp_detect_dpcd(intel_dp);
        else
                status = connector_status_disconnected;
@@ -5078,11 +5079,8 @@ intel_dp_long_pulse(struct intel_connector *connector,
         * Some external monitors do not signal loss of link synchronization
         * with an IRQ_HPD, so force a link status check.
         */
-       if (!intel_dp_is_edp(intel_dp)) {
-               struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
-
+       if (!intel_dp_is_edp(intel_dp))
                intel_dp_retrain_link(encoder, ctx);
-       }
 
        /*
         * Clearing NACK and defer counts to get their exact values