Commit 75a3a99a authored by Lukasz Luba's avatar Lukasz Luba Committed by Rafael J. Wysocki

PM: EM: Change the order of arguments in the .active_power() callback

The .active_power() callback passes the device pointer when it's called.
Aligned with a convetion present in other subsystems and pass the 'dev'
as a first argument. It looks more cleaner.

Adjust all affected drivers which implement that API callback.
Suggested-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Reviewed-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 91362463
...@@ -181,8 +181,8 @@ EM framework:: ...@@ -181,8 +181,8 @@ EM framework::
-> drivers/cpufreq/foo_cpufreq.c -> drivers/cpufreq/foo_cpufreq.c
01 static int est_power(unsigned long *mW, unsigned long *KHz, 01 static int est_power(struct device *dev, unsigned long *mW,
02 struct device *dev) 02 unsigned long *KHz)
03 { 03 {
04 long freq, power; 04 long freq, power;
05 05
......
...@@ -51,8 +51,8 @@ static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = { ...@@ -51,8 +51,8 @@ static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = {
}; };
static int __maybe_unused static int __maybe_unused
mtk_cpufreq_get_cpu_power(unsigned long *mW, mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *mW,
unsigned long *KHz, struct device *cpu_dev) unsigned long *KHz)
{ {
struct mtk_cpufreq_data *data; struct mtk_cpufreq_data *data;
struct cpufreq_policy *policy; struct cpufreq_policy *policy;
......
...@@ -96,8 +96,8 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask) ...@@ -96,8 +96,8 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)
} }
static int __maybe_unused static int __maybe_unused
scmi_get_cpu_power(unsigned long *power, unsigned long *KHz, scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power,
struct device *cpu_dev) unsigned long *KHz)
{ {
unsigned long Hz; unsigned long Hz;
int ret, domain; int ret, domain;
......
...@@ -1448,7 +1448,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_of_node); ...@@ -1448,7 +1448,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_of_node);
* Returns 0 on success or a proper -EINVAL value in case of error. * Returns 0 on success or a proper -EINVAL value in case of error.
*/ */
static int __maybe_unused static int __maybe_unused
_get_dt_power(unsigned long *mW, unsigned long *kHz, struct device *dev) _get_dt_power(struct device *dev, unsigned long *mW, unsigned long *kHz)
{ {
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
unsigned long opp_freq, opp_power; unsigned long opp_freq, opp_power;
...@@ -1482,8 +1482,8 @@ _get_dt_power(unsigned long *mW, unsigned long *kHz, struct device *dev) ...@@ -1482,8 +1482,8 @@ _get_dt_power(unsigned long *mW, unsigned long *kHz, struct device *dev)
* Returns -EINVAL if the power calculation failed because of missing * Returns -EINVAL if the power calculation failed because of missing
* parameters, 0 otherwise. * parameters, 0 otherwise.
*/ */
static int __maybe_unused _get_power(unsigned long *mW, unsigned long *kHz, static int __maybe_unused _get_power(struct device *dev, unsigned long *mW,
struct device *dev) unsigned long *kHz)
{ {
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
struct device_node *np; struct device_node *np;
......
...@@ -101,11 +101,11 @@ struct em_data_callback { ...@@ -101,11 +101,11 @@ struct em_data_callback {
/** /**
* active_power() - Provide power at the next performance state of * active_power() - Provide power at the next performance state of
* a device * a device
* @dev : Device for which we do this operation (can be a CPU)
* @power : Active power at the performance state * @power : Active power at the performance state
* (modified) * (modified)
* @freq : Frequency at the performance state in kHz * @freq : Frequency at the performance state in kHz
* (modified) * (modified)
* @dev : Device for which we do this operation (can be a CPU)
* *
* active_power() must find the lowest performance state of 'dev' above * active_power() must find the lowest performance state of 'dev' above
* 'freq' and update 'power' and 'freq' to the matching active power * 'freq' and update 'power' and 'freq' to the matching active power
...@@ -117,8 +117,8 @@ struct em_data_callback { ...@@ -117,8 +117,8 @@ struct em_data_callback {
* *
* Return 0 on success. * Return 0 on success.
*/ */
int (*active_power)(unsigned long *power, unsigned long *freq, int (*active_power)(struct device *dev, unsigned long *power,
struct device *dev); unsigned long *freq);
/** /**
* get_cost() - Provide the cost at the given performance state of * get_cost() - Provide the cost at the given performance state of
......
...@@ -140,7 +140,7 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd, ...@@ -140,7 +140,7 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
* lowest performance state of 'dev' above 'freq' and updates * lowest performance state of 'dev' above 'freq' and updates
* 'power' and 'freq' accordingly. * 'power' and 'freq' accordingly.
*/ */
ret = cb->active_power(&power, &freq, dev); ret = cb->active_power(dev, &power, &freq);
if (ret) { if (ret) {
dev_err(dev, "EM: invalid perf. state: %d\n", dev_err(dev, "EM: invalid perf. state: %d\n",
ret); ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment