diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-22 05:06:44 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-24 10:34:12 -0400 |
commit | f7f3d48ac858e4d2f0c71f8479d4ea022a35dd9c (patch) | |
tree | 39b71be0e1cf57b4d4860448e90c3b5846cb565d /drivers/gpu/drm/i915/intel_dp_mst.c | |
parent | fc0412ec0ff5aa7eef694ccde47606caa7c089e0 (diff) |
drm/i915: Fold in intel_mst_port_dp_detect
The indirection here seems to serve no purpose. Probably leftovers
from earlier revisions. Spotted while trying to review some mst
patches.
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index d9a7a7865f66..b03fa9026a9c 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -278,7 +278,7 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) | |||
278 | } | 278 | } |
279 | 279 | ||
280 | static enum drm_connector_status | 280 | static enum drm_connector_status |
281 | intel_mst_port_dp_detect(struct drm_connector *connector) | 281 | intel_dp_mst_detect(struct drm_connector *connector, bool force) |
282 | { | 282 | { |
283 | struct intel_connector *intel_connector = to_intel_connector(connector); | 283 | struct intel_connector *intel_connector = to_intel_connector(connector); |
284 | struct intel_dp *intel_dp = intel_connector->mst_port; | 284 | struct intel_dp *intel_dp = intel_connector->mst_port; |
@@ -286,14 +286,6 @@ intel_mst_port_dp_detect(struct drm_connector *connector) | |||
286 | return drm_dp_mst_detect_port(&intel_dp->mst_mgr, intel_connector->port); | 286 | return drm_dp_mst_detect_port(&intel_dp->mst_mgr, intel_connector->port); |
287 | } | 287 | } |
288 | 288 | ||
289 | static enum drm_connector_status | ||
290 | intel_dp_mst_detect(struct drm_connector *connector, bool force) | ||
291 | { | ||
292 | enum drm_connector_status status; | ||
293 | status = intel_mst_port_dp_detect(connector); | ||
294 | return status; | ||
295 | } | ||
296 | |||
297 | static int | 289 | static int |
298 | intel_dp_mst_set_property(struct drm_connector *connector, | 290 | intel_dp_mst_set_property(struct drm_connector *connector, |
299 | struct drm_property *property, | 291 | struct drm_property *property, |