drm/i915/hdmi: Remove old i2c symlink

Remove the i915 specific i2c-N symlink from HDMI connectors.
This was added to sort of mirror the DP connectors that alreayd
had their aux ch based i2c adapter sitting beneath them in the
sysfs hierarchy. But now that we have the standard "ddc" symlink
approach provided by the core let's switch to that fully.
I don't think anything beyond igt depends on this.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230829113920.13713-12-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index d55aeff43cce2b6ad5c36b51afb8c07e9644e1d4..af4102e91769c36972161d9ea10b9b254f774548 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2541,28 +2541,6 @@ static int intel_hdmi_get_modes(struct drm_connector *connector)
        return drm_edid_connector_add_modes(connector);
 }
 
-static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector)
-{
-       struct drm_i915_private *i915 = to_i915(connector->dev);
-       struct i2c_adapter *ddc = connector->ddc;
-       struct kobject *i2c_kobj = &ddc->dev.kobj;
-       struct kobject *connector_kobj = &connector->kdev->kobj;
-       int ret;
-
-       ret = sysfs_create_link(connector_kobj, i2c_kobj, i2c_kobj->name);
-       if (ret)
-               drm_err(&i915->drm, "Failed to create i2c symlink (%d)\n", ret);
-}
-
-static void intel_hdmi_remove_i2c_symlink(struct drm_connector *connector)
-{
-       struct i2c_adapter *ddc = connector->ddc;
-       struct kobject *i2c_kobj = &ddc->dev.kobj;
-       struct kobject *connector_kobj = &connector->kdev->kobj;
-
-       sysfs_remove_link(connector_kobj, i2c_kobj->name);
-}
-
 static int
 intel_hdmi_connector_register(struct drm_connector *connector)
 {
@@ -2572,8 +2550,6 @@ intel_hdmi_connector_register(struct drm_connector *connector)
        if (ret)
                return ret;
 
-       intel_hdmi_create_i2c_symlink(connector);
-
        return ret;
 }
 
@@ -2583,7 +2559,6 @@ static void intel_hdmi_connector_unregister(struct drm_connector *connector)
 
        cec_notifier_conn_unregister(n);
 
-       intel_hdmi_remove_i2c_symlink(connector);
        intel_connector_unregister(connector);
 }