lkml.org 
[lkml]   [2022]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [RESEND][PATCH 4/8] PM: EM: Change the order of arguments in the .active_power() callback
    Thanks!

    On Monday 21 Mar 2022 at 09:57:25 (+0000), Lukasz Luba wrote:
    > 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: Ionela Voinescu <ionela.voinescu@arm.com>
    > Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
    > ---
    > Documentation/power/energy-model.rst | 4 ++--
    > drivers/cpufreq/mediatek-cpufreq-hw.c | 4 ++--
    > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
    > drivers/opp/of.c | 6 +++---
    > include/linux/energy_model.h | 6 +++---
    > kernel/power/energy_model.c | 2 +-
    > 6 files changed, 13 insertions(+), 13 deletions(-)
    >
    > diff --git a/Documentation/power/energy-model.rst b/Documentation/power/energy-model.rst
    > index 49549aab41b4..fd29ed2506c0 100644
    > --- a/Documentation/power/energy-model.rst
    > +++ b/Documentation/power/energy-model.rst
    > @@ -181,8 +181,8 @@ EM framework::
    >
    > -> drivers/cpufreq/foo_cpufreq.c
    >
    > - 01 static int est_power(unsigned long *mW, unsigned long *KHz,
    > - 02 struct device *dev)
    > + 01 static int est_power(struct device *dev, unsigned long *mW,
    > + 02 unsigned long *KHz)
    > 03 {
    > 04 long freq, power;
    > 05
    > diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
    > index 0a94c56ddad2..813cccbfe934 100644
    > --- a/drivers/cpufreq/mediatek-cpufreq-hw.c
    > +++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
    > @@ -51,8 +51,8 @@ static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = {
    > };
    >
    > static int __maybe_unused
    > -mtk_cpufreq_get_cpu_power(unsigned long *mW,
    > - unsigned long *KHz, struct device *cpu_dev)
    > +mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *mW,
    > + unsigned long *KHz)
    > {
    > struct mtk_cpufreq_data *data;
    > struct cpufreq_policy *policy;
    > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
    > index 919fa6e3f462..6d2a4cf46db7 100644
    > --- a/drivers/cpufreq/scmi-cpufreq.c
    > +++ b/drivers/cpufreq/scmi-cpufreq.c
    > @@ -96,8 +96,8 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)
    > }
    >
    > static int __maybe_unused
    > -scmi_get_cpu_power(unsigned long *power, unsigned long *KHz,
    > - struct device *cpu_dev)
    > +scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power,
    > + unsigned long *KHz)
    > {
    > unsigned long Hz;
    > int ret, domain;
    > diff --git a/drivers/opp/of.c b/drivers/opp/of.c
    > index 440ab5a03df9..485ea980bde7 100644
    > --- a/drivers/opp/of.c
    > +++ b/drivers/opp/of.c
    > @@ -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.
    > */
    > 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;
    > unsigned long opp_freq, opp_power;
    > @@ -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
    > * parameters, 0 otherwise.
    > */
    > -static int __maybe_unused _get_power(unsigned long *mW, unsigned long *kHz,
    > - struct device *dev)
    > +static int __maybe_unused _get_power(struct device *dev, unsigned long *mW,
    > + unsigned long *kHz)
    > {
    > struct dev_pm_opp *opp;
    > struct device_node *np;
    > diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
    > index 92e82a322859..8419bffb4398 100644
    > --- a/include/linux/energy_model.h
    > +++ b/include/linux/energy_model.h
    > @@ -101,11 +101,11 @@ struct em_data_callback {
    > /**
    > * active_power() - Provide power at the next performance state of
    > * a device
    > + * @dev : Device for which we do this operation (can be a CPU)
    > * @power : Active power at the performance state
    > * (modified)
    > * @freq : Frequency at the performance state in kHz
    > * (modified)
    > - * @dev : Device for which we do this operation (can be a CPU)
    > *
    > * active_power() must find the lowest performance state of 'dev' above
    > * 'freq' and update 'power' and 'freq' to the matching active power
    > @@ -117,8 +117,8 @@ struct em_data_callback {
    > *
    > * Return 0 on success.
    > */
    > - int (*active_power)(unsigned long *power, unsigned long *freq,
    > - struct device *dev);
    > + int (*active_power)(struct device *dev, unsigned long *power,
    > + unsigned long *freq);
    >
    > /**
    > * get_cost() - Provide the cost at the given performance state of
    > diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
    > index 95a3b33001f6..babefc72085d 100644
    > --- a/kernel/power/energy_model.c
    > +++ b/kernel/power/energy_model.c
    > @@ -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
    > * 'power' and 'freq' accordingly.
    > */
    > - ret = cb->active_power(&power, &freq, dev);
    > + ret = cb->active_power(dev, &power, &freq);
    > if (ret) {
    > dev_err(dev, "EM: invalid perf. state: %d\n",
    > ret);

    Reviewed-by: Ionela Voinescu <ionela.voinescu@arm.com>

    > --
    > 2.17.1
    >

    \
     
     \ /
      Last update: 2022-04-04 18:03    [W:2.953 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site