[Intel-gfx] [PATCH 11/15] drm/edid/firmware: rename drm_load_edid_firmware() to drm_edid_load_firmware()

[Ville Syrjälä]

On Tue, Oct 11, 2022 at 04:49:45PM +0300, Jani Nikula wrote:
> Follow the usual naming convention by file name.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/drm_edid.c      | 10 +++++-----
>  drivers/gpu/drm/drm_edid_load.c |  2 +-
>  include/drm/drm_edid.h          |  4 ++--
>  3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 0f2898badd51..2c66a901474d 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -2211,7 +2211,7 @@ static struct edid *drm_get_override_edid(struct drm_connector *connector,
>  		override = drm_edid_duplicate(connector->edid_override->edid);
>  
>  	if (!override)
> -		override = drm_load_edid_firmware(connector);
> +		override = drm_edid_load_firmware(connector);
>  
>  	/* FIXME: Get alloc size from deeper down the stack */
>  	if (!IS_ERR_OR_NULL(override) && alloc_size)
> @@ -2443,7 +2443,7 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector,
>   * adapter and use drm_get_edid() instead of abusing this function.
>   *
>   * 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.
>   *
>   * Return: Pointer to valid EDID or NULL if we couldn't find any.
> @@ -2621,7 +2621,7 @@ EXPORT_SYMBOL(drm_get_edid);
>   * this function.
>   *
>   * 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.
>   *
>   * The returned pointer must be freed using drm_edid_free().
> @@ -2659,7 +2659,7 @@ EXPORT_SYMBOL(drm_edid_read_custom);
>   * Read EDID using the given I2C adapter.
>   *
>   * 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.
>   *
>   * Prefer initializing connector->ddc with drm_connector_init_with_ddc() and
> @@ -2695,7 +2695,7 @@ EXPORT_SYMBOL(drm_edid_read_ddc);
>   * Read EDID using the connector's I2C adapter.
>   *
>   * 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.
>   *
>   * The returned pointer must be freed using drm_edid_free().
> diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
> index 13cdbfb991eb..bc6b96abd1b3 100644
> --- a/drivers/gpu/drm/drm_edid_load.c
> +++ b/drivers/gpu/drm/drm_edid_load.c
> @@ -262,7 +262,7 @@ static void *edid_load(struct drm_connector *connector, const char *name)
>  	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;
>  	struct edid *edid;
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index a2e25e7e6ee5..dc7467d25cd8 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -388,12 +388,12 @@ int drm_av_sync_delay(struct drm_connector *connector,
>  		      const struct drm_display_mode *mode);
>  
>  #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_get_edid_firmware_path(char *buf, size_t bufsize);
>  #else
>  static inline struct edid *
> -drm_load_edid_firmware(struct drm_connector *connector)
> +drm_edid_load_firmware(struct drm_connector *connector)
>  {
>  	return ERR_PTR(-ENOENT);
>  }
> -- 
> 2.34.1

-- 
Ville Syrjälä
Intel