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

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

Documentation/power/energy-model.rst

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/cpufreq/mediatek-cpufreq-hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/opp/of.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

include/linux/energy_model.h

+3 −3
Original line number Diff line number Diff line
@@ -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