drm/edid: rename drm_find_edid_extension() to drm_edid_find_extension()

Follow the drm_edid_ naming convention.

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/b7a2c2509409de02bbd751541206586424a34725.1713259151.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 2256893d7d67f69f36e2f9da5b12dc3828e536ad..25aaae937ceb2463026f28a5eb3cba2d5e7b56fb 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -299,7 +299,7 @@ void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
 int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m);
 int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size);
 int drm_edid_override_reset(struct drm_connector *connector);
-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
+const u8 *drm_edid_find_extension(const struct drm_edid *drm_edid,
                                  int ext_id, int *ext_index);
 void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
 void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);

diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index f800dc0906d5d1099ee4461a66b934d597d563d3..9d01d762801ff2429a0ef49e7245bbd34cf0f373 100644 (file)
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -55,9 +55,10 @@ static const u8 *drm_find_displayid_extension(const struct drm_edid *drm_edid,
                                              int *length, int *idx,
                                              int *ext_index)
 {
-       const u8 *displayid = drm_find_edid_extension(drm_edid, DISPLAYID_EXT, ext_index);
        const struct displayid_header *base;
+       const u8 *displayid;
 
+       displayid = drm_edid_find_extension(drm_edid, DISPLAYID_EXT, ext_index);
        if (!displayid)
                return NULL;
 

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c4f7990595220548f1cedf613d89e64c80b74d0c..c29f31dcc818e2ace6fa0d30e08cdfb6ebec2235 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4200,7 +4200,7 @@ static int add_detailed_modes(struct drm_connector *connector,
  *
  * FIXME: Prefer not returning pointers to raw EDID data.
  */
-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
+const u8 *drm_edid_find_extension(const struct drm_edid *drm_edid,
                                  int ext_id, int *ext_index)
 {
        const u8 *edid_ext = NULL;
@@ -4234,7 +4234,7 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)
        bool found = false;
 
        /* Look for a top level CEA extension block */
-       if (drm_find_edid_extension(drm_edid, CEA_EXT, &ext_index))
+       if (drm_edid_find_extension(drm_edid, CEA_EXT, &ext_index))
                return true;
 
        /* CEA blocks can also be found embedded in a DisplayID block */