[PATCH v2 5/6] drm/i915/lspcon: remove dp_to_lspcon(), hide enc_to_intel_lspcon()

[Rodrigo Vivi]

On Tue, Feb 04, 2025 at 03:58:42PM +0200, Jani Nikula wrote:
> There are no users left for dp_to_lspcon(), remove it. The only two
> users of enc_to_intel_lspcon() are in intel_lspcon.c, so hide it there.
> 
> v2: Rebase

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_types.h | 12 ------------
>  drivers/gpu/drm/i915/display/intel_lspcon.c        |  5 +++++
>  2 files changed, 5 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index cb51b7936f93..a358620e2c09 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1982,24 +1982,12 @@ static inline bool intel_encoder_is_hdmi(struct intel_encoder *encoder)
>  	}
>  }
>  
> -static inline struct intel_lspcon *
> -enc_to_intel_lspcon(struct intel_encoder *encoder)
> -{
> -	return &enc_to_dig_port(encoder)->lspcon;
> -}
> -
>  static inline struct intel_digital_port *
>  dp_to_dig_port(struct intel_dp *intel_dp)
>  {
>  	return container_of(intel_dp, struct intel_digital_port, dp);
>  }
>  
> -static inline struct intel_lspcon *
> -dp_to_lspcon(struct intel_dp *intel_dp)
> -{
> -	return &dp_to_dig_port(intel_dp)->lspcon;
> -}
> -
>  static inline struct intel_digital_port *
>  hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
>  {
> diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
> index 45b63fea3642..02c22a981fe1 100644
> --- a/drivers/gpu/drm/i915/display/intel_lspcon.c
> +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
> @@ -55,6 +55,11 @@
>  #define  LSPCON_PARADE_AVI_IF_KICKOFF (1 << 7)
>  #define LSPCON_PARADE_AVI_IF_DATA_SIZE 32
>  
> +static struct intel_lspcon *enc_to_intel_lspcon(struct intel_encoder *encoder)
> +{
> +	return &enc_to_dig_port(encoder)->lspcon;
> +}
> +
>  static struct intel_dp *lspcon_to_intel_dp(struct intel_lspcon *lspcon)
>  {
>  	struct intel_digital_port *dig_port =
> -- 
> 2.39.5
>