[PATCH] drm/edid: make drm_edid_are_equal() static

[PATCH] drm/edid: make drm_edid_are_equal() static

[Jani Nikula]

drm_edid_are_equal() is only used within drm_edid.c. Make it static. Do
not encourage more uses of struct edid.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 3 +--
 include/drm/drm_edid.h     | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 923c4423151c..4c4e0d161490 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1818,7 +1818,7 @@ static bool edid_block_is_zero(const void *edid)
  * This helper can be used during probing to determine if
  * edid had changed.
  */
-bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
+static bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
 {
 	int edid1_len, edid2_len;
 	bool edid1_present = edid1 != NULL;
@@ -1840,7 +1840,6 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
 
 	return true;
 }
-EXPORT_SYMBOL(drm_edid_are_equal);
 
 enum edid_block_status {
 	EDID_BLOCK_OK = 0,
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 7923bc00dc7a..b3f01f388ea8 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -327,8 +327,6 @@ int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb);
 int drm_av_sync_delay(struct drm_connector *connector,
 		      const struct drm_display_mode *mode);
 
-bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);
-
 int
 drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
 					 const struct drm_connector *connector,
-- 
2.39.2

Re: [PATCH] drm/edid: make drm_edid_are_equal() static

[Jani Nikula]

On Thu, 14 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> drm_edid_are_equal() is only used within drm_edid.c. Make it static. Do
> not encourage more uses of struct edid.

Resent as part of https://patchwork.freedesktop.org/series/132142/

>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/drm_edid.c | 3 +--
>  include/drm/drm_edid.h     | 2 --
>  2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 923c4423151c..4c4e0d161490 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -1818,7 +1818,7 @@ static bool edid_block_is_zero(const void *edid)
>   * This helper can be used during probing to determine if
>   * edid had changed.
>   */
> -bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
> +static bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
>  {
>  	int edid1_len, edid2_len;
>  	bool edid1_present = edid1 != NULL;
> @@ -1840,7 +1840,6 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)
>  
>  	return true;
>  }
> -EXPORT_SYMBOL(drm_edid_are_equal);
>  
>  enum edid_block_status {
>  	EDID_BLOCK_OK = 0,
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 7923bc00dc7a..b3f01f388ea8 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -327,8 +327,6 @@ int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb);
>  int drm_av_sync_delay(struct drm_connector *connector,
>  		      const struct drm_display_mode *mode);
>  
> -bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);
> -
>  int
>  drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
>  					 const struct drm_connector *connector,

-- 
Jani Nikula, Intel