From: Imre Deak <imre.deak@intel.com>
Date: Wed, 8 May 2013 10:14:02 +0000 (+0300)
Subject: drm/i915: use enc_to_intel_dp() instead of opencoding the same
X-Git-Tag: v3.11-rc1~65^2~131^2~27
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ff8c9bac2d78634f34d9b6e43e04bf316a7f456;p=~emulex%2Finfiniband.git

drm/i915: use enc_to_intel_dp() instead of opencoding the same

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6096871c480..b1f50b15c6f 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -620,19 +620,17 @@ static inline struct intel_encoder *intel_attached_encoder(struct drm_connector
 	return to_intel_connector(connector)->encoder;
 }
 
-static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
-{
-	struct intel_digital_port *intel_dig_port =
-		container_of(encoder, struct intel_digital_port, base.base);
-	return &intel_dig_port->dp;
-}
-
 static inline struct intel_digital_port *
 enc_to_dig_port(struct drm_encoder *encoder)
 {
 	return container_of(encoder, struct intel_digital_port, base.base);
 }
 
+static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
+{
+	return &enc_to_dig_port(encoder)->dp;
+}
+
 static inline struct intel_digital_port *
 dp_to_dig_port(struct intel_dp *intel_dp)
 {