1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a4d80314e7f8..391b55f1cc74 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -59,8 +59,6 @@ struct intel_dp {
         bool is_pch_edp;
         uint8_t train_set[4];
         uint8_t link_status[DP_LINK_STATUS_SIZE];
-
-        struct drm_property *force_audio_property;
 };
 
 /**
@@ -1702,7 +1700,7 @@ intel_dp_set_property(struct drm_connector *connector,
         if (ret)
                 return ret;
 
-        if (property == intel_dp->force_audio_property) {
+        if (property == dev_priv->force_audio_property) {
                 int i = val;
                 bool has_audio;
 
@@ -1841,16 +1839,7 @@ bool intel_dpd_is_edp(struct drm_device *dev)
 static void
 intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
 {
-        struct drm_device *dev = connector->dev;
-
-        intel_dp->force_audio_property =
-                drm_property_create(dev, DRM_MODE_PROP_RANGE, "force_audio", 2);
-        if (intel_dp->force_audio_property) {
-                intel_dp->force_audio_property->values[0] = -1;
-                intel_dp->force_audio_property->values[1] = 1;
-                drm_connector_attach_property(connector, intel_dp->force_audio_property, 0);
-        }
-
+        intel_attach_force_audio_property(connector);
         intel_attach_broadcast_rgb_property(connector);
 }