Skip to content

Commit a05992d

Browse files
committed
drm/edid/firmware: rename drm_load_edid_firmware() to drm_edid_load_firmware()
Follow the usual naming convention by file name. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/d6714ae737d789764bd2bdb6e7c9a5f56c99eef3.1666614699.git.jani.nikula@intel.com
1 parent 8319d26 commit a05992d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

drivers/gpu/drm/drm_edid.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ static struct edid *drm_get_override_edid(struct drm_connector *connector,
22152215
mutex_unlock(&connector->edid_override_mutex);
22162216

22172217
if (!override)
2218-
override = drm_load_edid_firmware(connector);
2218+
override = drm_edid_load_firmware(connector);
22192219

22202220
/* FIXME: Get alloc size from deeper down the stack */
22212221
if (!IS_ERR_OR_NULL(override) && alloc_size)
@@ -2462,7 +2462,7 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector,
24622462
* adapter and use drm_get_edid() instead of abusing this function.
24632463
*
24642464
* The EDID may be overridden using debugfs override_edid or firmware EDID
2465-
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority
2465+
* (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
24662466
* order. Having either of them bypasses actual EDID reads.
24672467
*
24682468
* Return: Pointer to valid EDID or NULL if we couldn't find any.
@@ -2640,7 +2640,7 @@ EXPORT_SYMBOL(drm_get_edid);
26402640
* this function.
26412641
*
26422642
* The EDID may be overridden using debugfs override_edid or firmware EDID
2643-
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority
2643+
* (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
26442644
* order. Having either of them bypasses actual EDID reads.
26452645
*
26462646
* The returned pointer must be freed using drm_edid_free().
@@ -2678,7 +2678,7 @@ EXPORT_SYMBOL(drm_edid_read_custom);
26782678
* Read EDID using the given I2C adapter.
26792679
*
26802680
* The EDID may be overridden using debugfs override_edid or firmware EDID
2681-
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority
2681+
* (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
26822682
* order. Having either of them bypasses actual EDID reads.
26832683
*
26842684
* Prefer initializing connector->ddc with drm_connector_init_with_ddc() and
@@ -2714,7 +2714,7 @@ EXPORT_SYMBOL(drm_edid_read_ddc);
27142714
* Read EDID using the connector's I2C adapter.
27152715
*
27162716
* The EDID may be overridden using debugfs override_edid or firmware EDID
2717-
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority
2717+
* (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
27182718
* order. Having either of them bypasses actual EDID reads.
27192719
*
27202720
* The returned pointer must be freed using drm_edid_free().

drivers/gpu/drm/drm_edid_load.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static void *edid_load(struct drm_connector *connector, const char *name)
262262
return edid;
263263
}
264264

265-
struct edid *drm_load_edid_firmware(struct drm_connector *connector)
265+
struct edid *drm_edid_load_firmware(struct drm_connector *connector)
266266
{
267267
char *edidname, *last, *colon, *fwstr, *edidstr, *fallback = NULL;
268268
struct edid *edid;

include/drm/drm_edid.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,12 @@ int drm_av_sync_delay(struct drm_connector *connector,
388388
const struct drm_display_mode *mode);
389389

390390
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
391-
struct edid *drm_load_edid_firmware(struct drm_connector *connector);
391+
struct edid *drm_edid_load_firmware(struct drm_connector *connector);
392392
int __drm_set_edid_firmware_path(const char *path);
393393
int __drm_get_edid_firmware_path(char *buf, size_t bufsize);
394394
#else
395395
static inline struct edid *
396-
drm_load_edid_firmware(struct drm_connector *connector)
396+
drm_edid_load_firmware(struct drm_connector *connector)
397397
{
398398
return ERR_PTR(-ENOENT);
399399
}

0 commit comments

Comments
 (0)