Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aa26a3b authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: Rename dev_pm_opp_get_suspend_opp() and return OPP rate 



There is only one user of dev_pm_opp_get_suspend_opp() and that uses it
to get the OPP rate for the suspend_opp.

Rename dev_pm_opp_get_suspend_opp() as dev_pm_opp_get_suspend_opp_freq()
and return the rate directly from it.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8cd2f6e8

drivers/base/power/opp/core.c

+13 −14
Original line number Diff line number Diff line
@@ -328,32 +328,31 @@ unsigned long dev_pm_opp_get_max_transition_latency(struct device *dev) 
EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_transition_latency);



/**

 * dev_pm_opp_get_suspend_opp() - Get suspend opp

 * dev_pm_opp_get_suspend_opp_freq() - Get frequency of suspend opp in Hz

 * @dev:	device for which we do this operation

 *

 * Return: This function returns pointer to the suspend opp if it is

 * defined and available, otherwise it returns NULL.

 *

 * Locking: This function must be called under rcu_read_lock(). opp is a rcu

 * protected pointer. The reason for the same is that the opp pointer which is

 * returned will remain valid for use with opp_get_{voltage, freq} only while

 * under the locked area. The pointer returned must be used prior to unlocking

 * with rcu_read_unlock() to maintain the integrity of the pointer.

 * Return: This function returns the frequency of the OPP marked as suspend_opp

 * if one is available, else returns 0;

 */

struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)

unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)

{

	struct opp_table *opp_table;

	unsigned long freq = 0;



	opp_rcu_lockdep_assert();

	rcu_read_lock();



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table) || !opp_table->suspend_opp ||

	    !opp_table->suspend_opp->available)

		return NULL;

		goto unlock;



	return opp_table->suspend_opp;

	freq = dev_pm_opp_get_freq(opp_table->suspend_opp);



unlock:

	rcu_read_unlock();

	return freq;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);

EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp_freq);



/**

 * dev_pm_opp_get_opp_count() - Get number of opps available in the opp table

drivers/cpufreq/cpufreq-dt.c

+1 −6
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	struct private_data *priv;

	struct device *cpu_dev;

	struct clk *cpu_clk;

	struct dev_pm_opp *suspend_opp;

	unsigned int transition_latency;

	bool fallback = false;

	const char *name;
@@ -252,11 +251,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	policy->driver_data = priv;

	policy->clk = cpu_clk;



	rcu_read_lock();

	suspend_opp = dev_pm_opp_get_suspend_opp(cpu_dev);

	if (suspend_opp)

		policy->suspend_freq = dev_pm_opp_get_freq(suspend_opp) / 1000;

	rcu_read_unlock();

	policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000;



	ret = cpufreq_table_validate_and_show(policy, freq_table);

	if (ret) {

include/linux/pm_opp.h

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int dev_pm_opp_get_opp_count(struct device *dev); 
unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev);

unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev);

unsigned long dev_pm_opp_get_max_transition_latency(struct device *dev);

struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev);

unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev);



struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					      unsigned long freq,
@@ -159,9 +159,9 @@ static inline unsigned long dev_pm_opp_get_max_transition_latency(struct device 
	return 0;

}



static inline struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)

static inline unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)

{

	return NULL;

	return 0;

}



static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,