Re: [RESEND 2/2] drm/edid: make drm_edid_block_valid() static

[Jani Nikula <jani.nikula@intel.com>]

On Mon, 12 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> drm_edid_block_valid() is no longer used outside of drm_edid.c. Make it
> static.
>
> Acked-by: Zhi Wang <zhiwang@kernel.rog>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Both pushed to drm-misc-next with Sima's R-b on patch 2.

BR,
Jani.


>
> ---
>
> Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
> Cc: Zhi Wang <zhi.wang.linux@gmail.com>
> Cc: intel-gvt-dev@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/gpu/drm/drm_edid.c | 17 ++++-------------
>  include/drm/drm_edid.h     |  2 --
>  2 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index f68a41eeb1fa..13b3fd351b16 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -1966,22 +1966,14 @@ static void edid_block_dump(const char *level, const void *block, int block_num)
>  		       block, EDID_LENGTH, false);
>  }
>  
> -/**
> - * drm_edid_block_valid - Sanity check the EDID block (base or extension)
> - * @_block: pointer to raw EDID block
> - * @block_num: type of block to validate (0 for base, extension otherwise)
> - * @print_bad_edid: if true, dump bad EDID blocks to the console
> - * @edid_corrupt: if true, the header or checksum is invalid
> - *
> +/*
>   * Validate a base or extension EDID block and optionally dump bad blocks to
>   * the console.
> - *
> - * Return: True if the block is valid, false otherwise.
>   */
> -bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid,
> -			  bool *edid_corrupt)
> +static bool drm_edid_block_valid(void *_block, int block_num, bool print_bad_edid,
> +				 bool *edid_corrupt)
>  {
> -	struct edid *block = (struct edid *)_block;
> +	struct edid *block = _block;
>  	enum edid_block_status status;
>  	bool is_base_block = block_num == 0;
>  	bool valid;
> @@ -2024,7 +2016,6 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid,
>  
>  	return valid;
>  }
> -EXPORT_SYMBOL(drm_edid_block_valid);
>  
>  /**
>   * drm_edid_is_valid - sanity check EDID data
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 6bdfa254a1c1..eaac5e665892 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -440,8 +440,6 @@ int drm_add_modes_noedid(struct drm_connector *connector,
>  			 int hdisplay, int vdisplay);
>  
>  int drm_edid_header_is_valid(const void *edid);
> -bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
> -			  bool *edid_corrupt);
>  bool drm_edid_is_valid(struct edid *edid);
>  void drm_edid_get_monitor_name(const struct edid *edid, char *name,
>  			       int buflen);

-- 
Jani Nikula, Intel