Commit a05992d5 authored by Jani Nikula's avatar Jani Nikula

drm/edid/firmware: rename drm_load_edid_firmware() to drm_edid_load_firmware()

Follow the usual naming convention by file name.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d6714ae737d789764bd2bdb6e7c9a5f56c99eef3.1666614699.git.jani.nikula@intel.com
parent 8319d26a
...@@ -2215,7 +2215,7 @@ static struct edid *drm_get_override_edid(struct drm_connector *connector, ...@@ -2215,7 +2215,7 @@ static struct edid *drm_get_override_edid(struct drm_connector *connector,
mutex_unlock(&connector->edid_override_mutex); mutex_unlock(&connector->edid_override_mutex);
if (!override) if (!override)
override = drm_load_edid_firmware(connector); override = drm_edid_load_firmware(connector);
/* FIXME: Get alloc size from deeper down the stack */ /* FIXME: Get alloc size from deeper down the stack */
if (!IS_ERR_OR_NULL(override) && alloc_size) if (!IS_ERR_OR_NULL(override) && alloc_size)
...@@ -2462,7 +2462,7 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector, ...@@ -2462,7 +2462,7 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector,
* adapter and use drm_get_edid() instead of abusing this function. * adapter and use drm_get_edid() instead of abusing this function.
* *
* The EDID may be overridden using debugfs override_edid or firmware EDID * The EDID may be overridden using debugfs override_edid or firmware EDID
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
* order. Having either of them bypasses actual EDID reads. * order. Having either of them bypasses actual EDID reads.
* *
* Return: Pointer to valid EDID or NULL if we couldn't find any. * Return: Pointer to valid EDID or NULL if we couldn't find any.
...@@ -2640,7 +2640,7 @@ EXPORT_SYMBOL(drm_get_edid); ...@@ -2640,7 +2640,7 @@ EXPORT_SYMBOL(drm_get_edid);
* this function. * this function.
* *
* The EDID may be overridden using debugfs override_edid or firmware EDID * The EDID may be overridden using debugfs override_edid or firmware EDID
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
* order. Having either of them bypasses actual EDID reads. * order. Having either of them bypasses actual EDID reads.
* *
* The returned pointer must be freed using drm_edid_free(). * The returned pointer must be freed using drm_edid_free().
...@@ -2678,7 +2678,7 @@ EXPORT_SYMBOL(drm_edid_read_custom); ...@@ -2678,7 +2678,7 @@ EXPORT_SYMBOL(drm_edid_read_custom);
* Read EDID using the given I2C adapter. * Read EDID using the given I2C adapter.
* *
* The EDID may be overridden using debugfs override_edid or firmware EDID * The EDID may be overridden using debugfs override_edid or firmware EDID
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
* order. Having either of them bypasses actual EDID reads. * order. Having either of them bypasses actual EDID reads.
* *
* Prefer initializing connector->ddc with drm_connector_init_with_ddc() and * Prefer initializing connector->ddc with drm_connector_init_with_ddc() and
...@@ -2714,7 +2714,7 @@ EXPORT_SYMBOL(drm_edid_read_ddc); ...@@ -2714,7 +2714,7 @@ EXPORT_SYMBOL(drm_edid_read_ddc);
* Read EDID using the connector's I2C adapter. * Read EDID using the connector's I2C adapter.
* *
* The EDID may be overridden using debugfs override_edid or firmware EDID * The EDID may be overridden using debugfs override_edid or firmware EDID
* (drm_load_edid_firmware() and drm.edid_firmware parameter), in this priority * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority
* order. Having either of them bypasses actual EDID reads. * order. Having either of them bypasses actual EDID reads.
* *
* The returned pointer must be freed using drm_edid_free(). * The returned pointer must be freed using drm_edid_free().
......
...@@ -262,7 +262,7 @@ static void *edid_load(struct drm_connector *connector, const char *name) ...@@ -262,7 +262,7 @@ static void *edid_load(struct drm_connector *connector, const char *name)
return edid; return edid;
} }
struct edid *drm_load_edid_firmware(struct drm_connector *connector) struct edid *drm_edid_load_firmware(struct drm_connector *connector)
{ {
char *edidname, *last, *colon, *fwstr, *edidstr, *fallback = NULL; char *edidname, *last, *colon, *fwstr, *edidstr, *fallback = NULL;
struct edid *edid; struct edid *edid;
......
...@@ -388,12 +388,12 @@ int drm_av_sync_delay(struct drm_connector *connector, ...@@ -388,12 +388,12 @@ int drm_av_sync_delay(struct drm_connector *connector,
const struct drm_display_mode *mode); const struct drm_display_mode *mode);
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
struct edid *drm_load_edid_firmware(struct drm_connector *connector); struct edid *drm_edid_load_firmware(struct drm_connector *connector);
int __drm_set_edid_firmware_path(const char *path); int __drm_set_edid_firmware_path(const char *path);
int __drm_get_edid_firmware_path(char *buf, size_t bufsize); int __drm_get_edid_firmware_path(char *buf, size_t bufsize);
#else #else
static inline struct edid * static inline struct edid *
drm_load_edid_firmware(struct drm_connector *connector) drm_edid_load_firmware(struct drm_connector *connector)
{ {
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment