drm: drop _mode_ from update_edit_property()

Just makes it longer, and for most things in drm_connector.[hc] we
just use the drm_connector_ prefix. Done with sed + a bit of manual
fixup for the indenting.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-6-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 881f7cb..c770d73 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)
        int ret;
 
        if (amdgpu_connector->edid) {
-               drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);
+               drm_connector_update_edid_property(connector, amdgpu_connector->edid);
                ret = drm_add_edid_modes(connector, amdgpu_connector->edid);
                return ret;
        }
-       drm_mode_connector_update_edid_property(connector, NULL);
+       drm_connector_update_edid_property(connector, NULL);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 66bd3cc..c4ab198 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
                                (struct edid *) sink->dc_edid.raw_edid;
 
 
-                       drm_mode_connector_update_edid_property(connector,
+                       drm_connector_update_edid_property(connector,
                                        aconnector->edid);
                }
                amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
 
        } else {
                amdgpu_dm_remove_sink_from_freesync_module(connector);
-               drm_mode_connector_update_edid_property(connector, NULL);
+               drm_connector_update_edid_property(connector, NULL);
                aconnector->num_modes = 0;
                aconnector->dc_sink = NULL;
                aconnector->edid = NULL;

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 4304d9e..581bb75 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
                edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
 
                if (!edid) {
-                       drm_mode_connector_update_edid_property(
+                       drm_connector_update_edid_property(
                                &aconnector->base,
                                NULL);
                        return ret;
@@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
                                        connector, aconnector->edid);
        }
 
-       drm_mode_connector_update_edid_property(
+       drm_connector_update_edid_property(
                                        &aconnector->base, aconnector->edid);
 
        ret = drm_add_edid_modes(connector, aconnector->edid);

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 036dff8..1bb8174 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector)
        if (!flags)
                edid = drm_get_edid(connector, &ast_connector->i2c->adapter);
        if (edid) {
-               drm_mode_connector_update_edid_property(&ast_connector->base, edid);
+               drm_connector_update_edid_property(&ast_connector->base, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
                return ret;
        } else
-               drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
+               drm_connector_update_edid_property(&ast_connector->base, NULL);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 73021b3..1f47459 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
                __adv7511_power_off(adv7511);
 
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        count = drm_add_edid_modes(connector, edid);
 
        adv7511_set_config_csc(adv7511, connector, adv7511->rgb,

diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index b490438..37f947d 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -969,8 +969,8 @@ static int anx78xx_get_modes(struct drm_connector *connector)
                goto unlock;
        }
 
-       err = drm_mode_connector_update_edid_property(connector,
-                                                     anx78xx->edid);
+       err = drm_connector_update_edid_property(connector,
+                                                anx78xx->edid);
        if (err) {
                DRM_ERROR("Failed to update EDID property: %d\n", err);
                goto unlock;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 2bcbfad..288c015 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1119,8 +1119,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
                edid = drm_get_edid(connector, &dp->aux.ddc);
                pm_runtime_put(dp->dev);
                if (edid) {
-                       drm_mode_connector_update_edid_property(&dp->connector,
-                                                               edid);
+                       drm_connector_update_edid_property(&dp->connector,
+                                                          edid);
                        num_modes += drm_add_edid_modes(&dp->connector, edid);
                        kfree(edid);
                }

diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index 9837c8d..da99b8b 100644 (file)
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -55,7 +55,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)
                goto fallback;
        }
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        kfree(edid);
        return ret;

diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index 7ccadba..b49b543 100644 (file)
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -152,7 +152,7 @@ static int ge_b850v3_lvds_get_modes(struct drm_connector *connector)
        ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client);
 
        if (ge_b850v3_lvds_ptr->edid) {
-               drm_mode_connector_update_edid_property(connector,
+               drm_connector_update_edid_property(connector,
                                                      ge_b850v3_lvds_ptr->edid);
                num_modes = drm_add_edid_modes(connector,
                                               ge_b850v3_lvds_ptr->edid);

diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index d64a328..bd5c191 100644 (file)
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -222,7 +222,7 @@ static int ptn3460_get_modes(struct drm_connector *connector)
        }
 
        ptn_bridge->edid = (struct edid *)edid;
-       drm_mode_connector_update_edid_property(connector, ptn_bridge->edid);
+       drm_connector_update_edid_property(connector, ptn_bridge->edid);
 
        num_modes = drm_add_edid_modes(connector, ptn_bridge->edid);
 

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 60373d7..cd33193 100644 (file)
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -170,7 +170,7 @@ static int sii902x_get_modes(struct drm_connector *connector)
                return ret;
 
        edid = drm_get_edid(connector, sii902x->i2c->adapter);
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        if (edid) {
                num = drm_add_edid_modes(connector, edid);
                kfree(edid);

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 3c136f2..ab32ace 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1922,7 +1922,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
 
                hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
                hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);

diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 0fd9cf2..ee2fd0a 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1140,7 +1140,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)
        if (!edid)
                return 0;
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        count = drm_add_edid_modes(connector, edid);
 
        return count;

diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index acb8570..c81bf79 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -62,7 +62,7 @@ static int tfp410_get_modes(struct drm_connector *connector)
                goto fallback;
        }
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        return drm_add_edid_modes(connector, edid);
 fallback:

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 5ada064..b2b182f 100644 (file)
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -814,7 +814,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
  *     Blob property which contains the current EDID read from the sink. This
  *     is useful to parse sink identification information like vendor, model
  *     and serial. Drivers should update this property by calling
- *     drm_mode_connector_update_edid_property(), usually after having parsed
+ *     drm_connector_update_edid_property(), usually after having parsed
  *     the EDID using drm_add_edid_modes(). Userspace cannot change this
  *     property.
  * DPMS:
@@ -1497,7 +1497,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
 EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
 
 /**
- * drm_mode_connector_update_edid_property - update the edid property of a connector
+ * drm_connector_update_edid_property - update the edid property of a connector
  * @connector: drm connector
  * @edid: new value of the edid property
  *
@@ -1507,7 +1507,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
  * Returns:
  * Zero on success, negative errno on failure.
  */
-int drm_mode_connector_update_edid_property(struct drm_connector *connector,
+int drm_connector_update_edid_property(struct drm_connector *connector,
                                            const struct edid *edid)
 {
        struct drm_device *dev = connector->dev;
@@ -1546,7 +1546,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
                                               dev->mode_config.edid_property);
        return ret;
 }
-EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
+EXPORT_SYMBOL(drm_connector_update_edid_property);
 
 /**
  * drm_mode_connector_set_link_status_property - Set link status property of a connector

diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 50a20bf..6f28fe5 100644 (file)
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -314,13 +314,13 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
 
        if (len == 5 && !strncmp(buf, "reset", 5)) {
                connector->override_edid = false;
-               ret = drm_mode_connector_update_edid_property(connector, NULL);
+               ret = drm_connector_update_edid_property(connector, NULL);
        } else if (len < EDID_LENGTH ||
                   EDID_LENGTH * (1 + edid->extensions) > len)
                ret = -EINVAL;
        else {
                connector->override_edid = false;
-               ret = drm_mode_connector_update_edid_property(connector, edid);
+               ret = drm_connector_update_edid_property(connector, edid);
                if (!ret)
                        connector->override_edid = true;
        }

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 34fe270..3d58e0e 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -472,7 +472,7 @@ retry:
        if (connector->status == connector_status_disconnected) {
                DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
                        connector->base.id, connector->name);
-               drm_mode_connector_update_edid_property(connector, NULL);
+               drm_connector_update_edid_property(connector, NULL);
                verbose_prune = false;
                goto prune;
        }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index e6b0940..dfea61e 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -319,7 +319,7 @@ static int vidi_get_modes(struct drm_connector *connector)
                return -ENOMEM;
        }
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        return drm_add_edid_modes(connector, edid);
 }

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index db91932..6672d0f 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -888,7 +888,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
                (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
                edid->width_cm, edid->height_cm);
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
 
        ret = drm_add_edid_modes(connector, edid);

diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 5ea785f..90ed200 100644 (file)
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1770,7 +1770,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
 
        edid = drm_get_edid(connector, &intel_dp->adapter);
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index f087899..4e4e4a6 100644 (file)
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -216,7 +216,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
 
        edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index 78566a8..c6d72de 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -578,7 +578,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
        }
 
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
        }
        return ret;

diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index e6943fe..83babb8 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -376,7 +376,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
         * preferred mode is the right one.
         */
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                drm_add_edid_modes(connector, edid);
                kfree(edid);
 

diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
index e536072..fb4da3c 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_intel_modes.c
+++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
@@ -66,7 +66,7 @@ int psb_intel_ddc_get_modes(struct drm_connector *connector,
 
        edid = drm_get_edid(connector, adapter);
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 1d40746..dd3cec0 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1472,7 +1472,7 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
                bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
 
                if (connector_is_digital == monitor_is_digital) {
-                       drm_mode_connector_update_edid_property(connector, edid);
+                       drm_connector_update_edid_property(connector, edid);
                        drm_add_edid_modes(connector, edid);
                }
 

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 0038c97..d434f57 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1243,7 +1243,7 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
                return 0;
        }
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        n = drm_add_edid_modes(connector, edid);
 
        kfree(edid);

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b021801..c8268f3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6231,7 +6231,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
        edid = drm_get_edid(connector, &intel_dp->aux.ddc);
        if (edid) {
                if (drm_add_edid_modes(connector, edid)) {
-                       drm_mode_connector_update_edid_property(connector,
+                       drm_connector_update_edid_property(connector,
                                                                edid);
                } else {
                        kfree(edid);

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index bb06744..ca55b0a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1131,7 +1131,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
                                    intel_gmbus_get_adapter(dev_priv, pin));
        if (edid) {
                if (drm_add_edid_modes(connector, edid)) {
-                       drm_mode_connector_update_edid_property(connector,
+                       drm_connector_update_edid_property(connector,
                                                                edid);
                } else {
                        kfree(edid);

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index b398466..ca44bf3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
 {
        int ret;
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
 
        return ret;

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e6a64b3..a88611a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1913,7 +1913,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
        if (edid != NULL) {
                if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
                                                      edid)) {
-                       drm_mode_connector_update_edid_property(connector, edid);
+                       drm_connector_update_edid_property(connector, edid);
                        drm_add_edid_modes(connector, edid);
                }
 

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 56dd7a9..ae81cbb 100644 (file)
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
                imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
 
        if (imx_ldb_ch->edid) {
-               drm_mode_connector_update_edid_property(connector,
+               drm_connector_update_edid_property(connector,
                                                        imx_ldb_ch->edid);
                num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
        }

diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index bc27c26..1a4ced5 100644 (file)
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -235,7 +235,7 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector)
 
        edid = drm_get_edid(connector, tve->ddc);
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index aedecda..4fc1cf5 100644 (file)
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -63,7 +63,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
        }
 
        if (imxpd->edid) {
-               drm_mode_connector_update_edid_property(connector, imxpd->edid);
+               drm_connector_update_edid_property(connector, imxpd->edid);
                num_modes = drm_add_edid_modes(connector, imxpd->edid);
        }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 59a1102..8353139 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1220,7 +1220,7 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
 
        hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
 
-       drm_mode_connector_update_edid_property(conn, edid);
+       drm_connector_update_edid_property(conn, edid);
 
        ret = drm_add_edid_modes(conn, edid);
        kfree(edid);

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 8918539..5f104f1 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1553,7 +1553,7 @@ static int mga_vga_get_modes(struct drm_connector *connector)
 
        edid = drm_get_edid(connector, &mga_connector->i2c->adapter);
        if (edid) {
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 6f3fc6b..0b5eac0 100644 (file)
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -56,7 +56,7 @@ static int edp_connector_get_modes(struct drm_connector *connector)
        if (ret)
                return ret;
 
-       drm_mode_connector_update_edid_property(connector, drm_edid);
+       drm_connector_update_edid_property(connector, drm_edid);
        if (drm_edid)
                ret = drm_add_edid_modes(connector, drm_edid);
 

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index c0848df..07feacc 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -392,7 +392,7 @@ static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
        hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
 
        hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        if (edid) {
                ret = drm_add_edid_modes(connector, edid);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b83465a..2fabb69 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -850,7 +850,7 @@ nv50_mstc_get_modes(struct drm_connector *connector)
        int ret = 0;
 
        mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
-       drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
+       drm_connector_update_edid_property(&mstc->connector, mstc->edid);
        if (mstc->edid)
                ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index bb46c1d..22a1547 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -550,7 +550,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
 
        /* Cleanup the previous EDID block. */
        if (nv_connector->edid) {
-               drm_mode_connector_update_edid_property(connector, NULL);
+               drm_connector_update_edid_property(connector, NULL);
                kfree(nv_connector->edid);
                nv_connector->edid = NULL;
        }
@@ -575,7 +575,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                else
                        nv_connector->edid = drm_get_edid(connector, i2c);
 
-               drm_mode_connector_update_edid_property(connector,
+               drm_connector_update_edid_property(connector,
                                                        nv_connector->edid);
                if (!nv_connector->edid) {
                        NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
@@ -657,7 +657,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
 
        /* Cleanup the previous EDID block. */
        if (nv_connector->edid) {
-               drm_mode_connector_update_edid_property(connector, NULL);
+               drm_connector_update_edid_property(connector, NULL);
                kfree(nv_connector->edid);
                nv_connector->edid = NULL;
        }
@@ -721,7 +721,7 @@ out:
                status = connector_status_unknown;
 #endif
 
-       drm_mode_connector_update_edid_property(connector, nv_connector->edid);
+       drm_connector_update_edid_property(connector, nv_connector->edid);
        nouveau_connector_set_encoder(connector, nv_encoder);
        return status;
 }

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 5cde26a..2ddb856 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -126,14 +126,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
 
                if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
                                drm_edid_is_valid(edid)) {
-                       drm_mode_connector_update_edid_property(
+                       drm_connector_update_edid_property(
                                        connector, edid);
                        n = drm_add_edid_modes(connector, edid);
 
                        omap_connector->hdmi_mode =
                                drm_detect_hdmi_monitor(edid);
                } else {
-                       drm_mode_connector_update_edid_property(
+                       drm_connector_update_edid_property(
                                        connector, NULL);
                }
 

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 86fec03..5b5d0a2 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -252,7 +252,7 @@ static int panel_simple_get_modes(struct drm_panel *panel)
        /* probe EDID if a DDC bus is available */
        if (p->ddc) {
                struct edid *edid = drm_get_edid(panel->connector, p->ddc);
-               drm_mode_connector_update_edid_property(panel->connector, edid);
+               drm_connector_update_edid_property(panel->connector, edid);
                if (edid) {
                        num += drm_add_edid_modes(panel->connector, edid);
                        kfree(edid);

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 0655698..414642e 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -368,11 +368,11 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)
        int ret;
 
        if (radeon_connector->edid) {
-               drm_mode_connector_update_edid_property(connector, radeon_connector->edid);
+               drm_connector_update_edid_property(connector, radeon_connector->edid);
                ret = drm_add_edid_modes(connector, radeon_connector->edid);
                return ret;
        }
-       drm_mode_connector_update_edid_property(connector, NULL);
+       drm_connector_update_edid_property(connector, NULL);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index cd8a3ee..37956cf 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -195,11 +195,11 @@ static int radeon_dp_mst_get_ddc_modes(struct drm_connector *connector)
        radeon_connector->edid = edid;
        DRM_DEBUG_KMS("edid retrieved %p\n", edid);
        if (radeon_connector->edid) {
-               drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
+               drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
                ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);
                return ret;
        }
-       drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
+       drm_connector_update_edid_property(&radeon_connector->base, NULL);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index c6fbdcd..a40cb2b 100644 (file)
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -275,7 +275,7 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
                dp->sink_has_audio = drm_detect_monitor_audio(edid);
                ret = drm_add_edid_modes(connector, edid);
                if (ret)
-                       drm_mode_connector_update_edid_property(connector,
+                       drm_connector_update_edid_property(connector,
                                                                edid);
        }
        mutex_unlock(&dp->lock);

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 88d0774..510fcb3 100644 (file)
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -565,7 +565,7 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
        if (edid) {
                hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
                hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
-               drm_mode_connector_update_edid_property(connector, edid);
+               drm_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 58f4311..0c30083 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -977,7 +977,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
        cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
 
        count = drm_add_edid_modes(connector, edid);
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        kfree(edid);
        return count;

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index fa4bcd0..9b4b1d0 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -220,7 +220,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)
        DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
                         hdmi->hdmi_monitor ? "an HDMI" : "a DVI");
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
        ret = drm_add_edid_modes(connector, edid);
        kfree(edid);

diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index 0c09365..c662efc 100644 (file)
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -37,7 +37,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
                edid = drm_get_edid(connector, output->ddc);
 
        cec_notifier_set_phys_addr_from_edid(output->notifier, edid);
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        if (edid) {
                err = drm_add_edid_modes(connector, edid);

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index c45cabb..46dacca 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
 
        edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
 
        if (edid) {
                ret = drm_add_edid_modes(connector, edid);

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 09dc585..8fac12e 100644 (file)
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -99,7 +99,7 @@ static int udl_get_modes(struct drm_connector *connector)
                                        struct udl_drm_connector,
                                        connector);
 
-       drm_mode_connector_update_edid_property(connector, udl_connector->edid);
+       drm_connector_update_edid_property(connector, udl_connector->edid);
        if (udl_connector->edid)
                return drm_add_edid_modes(connector, udl_connector->edid);
        return 0;

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index b8d5053..91f284e 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -285,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
                        drm_rgb_quant_range_selectable(edid);
        }
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        kfree(edid);
 

diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index 13ea90f..d073c67 100644 (file)
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -272,7 +272,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)
 
        hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
        hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        kfree(edid);
 

diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 3e7e33c..3e78ee2 100644 (file)
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -109,7 +109,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)
         */
        zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE);
 
-       drm_mode_connector_update_edid_property(connector, edid);
+       drm_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        kfree(edid);
 

diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 5c7ea23..a943d2f 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -504,7 +504,7 @@ static void vbox_set_edid(struct drm_connector *connector, int width,
        for (i = 0; i < EDID_SIZE - 1; ++i)
                sum += edid[i];
        edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-       drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
+       drm_connector_update_edid_property(connector, (struct edid *)edid);
 }
 
 static int vbox_get_modes(struct drm_connector *connector)

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index e09e16b..4411c05 100644 (file)
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -896,7 +896,7 @@ struct drm_connector {
        /**
         * @edid_blob_ptr: DRM property containing EDID if present. Protected by
         * &drm_mode_config.mutex. This should be updated only by calling
-        * drm_mode_connector_update_edid_property().
+        * drm_connector_update_edid_property().
         */
        struct drm_property_blob *edid_blob_ptr;
 
@@ -1194,8 +1194,8 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
 int drm_mode_connector_set_path_property(struct drm_connector *connector,
                                         const char *path);
 int drm_mode_connector_set_tile_property(struct drm_connector *connector);
-int drm_mode_connector_update_edid_property(struct drm_connector *connector,
-                                           const struct edid *edid);
+int drm_connector_update_edid_property(struct drm_connector *connector,
+                                      const struct edid *edid);
 void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
                                                 uint64_t link_status);
 int drm_connector_init_panel_orientation_property(

diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index d0eb76c..61142aa 100644 (file)
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -785,7 +785,7 @@ struct drm_connector_helper_funcs {
         *
         * This function should fill in all modes currently valid for the sink
         * into the &drm_connector.probed_modes list. It should also update the
-        * EDID property by calling drm_mode_connector_update_edid_property().
+        * EDID property by calling drm_connector_update_edid_property().
         *
         * The usual way to implement this is to cache the EDID retrieved in the
         * probe callback somewhere in the driver-private connector structure.