Re: [PATCH 6/6] OPP: Reuse dev_pm_opp_get_freq_indexed()

[Manivannan Sadhasivam]

On Fri, Jul 21, 2023 at 03:10:59PM +0530, Viresh Kumar wrote:
> Reuse dev_pm_opp_get_freq_indexed() from dev_pm_opp_get_freq().
> 
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>

Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>

- Mani

> ---
>  drivers/opp/core.c     | 21 ---------------------
>  include/linux/pm_opp.h | 12 +++++-------
>  2 files changed, 5 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/opp/core.c b/drivers/opp/core.c
> index 95f49fbe431c..16a103e6695b 100644
> --- a/drivers/opp/core.c
> +++ b/drivers/opp/core.c
> @@ -176,27 +176,6 @@ unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp)
>  }
>  EXPORT_SYMBOL_GPL(dev_pm_opp_get_power);
>  
> -/**
> - * dev_pm_opp_get_freq() - Gets the frequency corresponding to an available opp
> - * @opp:	opp for which frequency has to be returned for
> - *
> - * Return: frequency in hertz corresponding to the opp, else
> - * return 0
> - */
> -unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
> -{
> -	if (IS_ERR_OR_NULL(opp)) {
> -		pr_err("%s: Invalid parameters\n", __func__);
> -		return 0;
> -	}
> -
> -	if (!assert_single_clk(opp->opp_table))
> -		return 0;
> -
> -	return opp->rates[0];
> -}
> -EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq);
> -
>  /**
>   * dev_pm_opp_get_freq_indexed() - Gets the frequency corresponding to an
>   *				   available opp with specified index
> diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
> index 23e4e4eaaa42..91f87d7e807c 100644
> --- a/include/linux/pm_opp.h
> +++ b/include/linux/pm_opp.h
> @@ -103,8 +103,6 @@ int dev_pm_opp_get_supplies(struct dev_pm_opp *opp, struct dev_pm_opp_supply *su
>  
>  unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp);
>  
> -unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp);
> -
>  unsigned long dev_pm_opp_get_freq_indexed(struct dev_pm_opp *opp, u32 index);
>  
>  unsigned int dev_pm_opp_get_level(struct dev_pm_opp *opp);
> @@ -214,11 +212,6 @@ static inline unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp)
>  	return 0;
>  }
>  
> -static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
> -{
> -	return 0;
> -}
> -
>  static inline unsigned long dev_pm_opp_get_freq_indexed(struct dev_pm_opp *opp, u32 index)
>  {
>  	return 0;
> @@ -669,4 +662,9 @@ static inline void dev_pm_opp_put_prop_name(int token)
>  	dev_pm_opp_clear_config(token);
>  }
>  
> +static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
> +{
> +	return dev_pm_opp_get_freq_indexed(opp, 0);
> +}
> +
>  #endif		/* __LINUX_OPP_H__ */
> -- 
> 2.31.1.272.g89b43f80a514
> 

-- 
மணிவண்ணன் சதாசிவம்