Commit e34cab4c authored by Lukasz Luba's avatar Lukasz Luba Committed by Zhang Rui
Browse files

thermal: devfreq_cooling: refactor code and add get_voltage function 



Move the code which gets the voltage for a given frequency.
This code will be resused in few places.

Acked-by: default avatarJavi Merino <javi.merino@kernel.org>
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent 39da7c50

drivers/thermal/devfreq_cooling.c

+28 −17
Original line number Diff line number Diff line
@@ -164,27 +164,12 @@ freq_get_state(struct devfreq_cooling_device *dfc, unsigned long freq) 
	return THERMAL_CSTATE_INVALID;

}



/**

 * get_static_power() - calculate the static power

 * @dfc:	Pointer to devfreq cooling device

 * @freq:	Frequency in Hz

 *

 * Calculate the static power in milliwatts using the supplied

 * get_static_power().  The current voltage is calculated using the

 * OPP library.  If no get_static_power() was supplied, assume the

 * static power is negligible.

 */

static unsigned long

get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq)

static unsigned long get_voltage(struct devfreq *df, unsigned long freq)

{

	struct devfreq *df = dfc->devfreq;

	struct device *dev = df->dev.parent;

	unsigned long voltage;

	struct dev_pm_opp *opp;



	if (!dfc->power_ops->get_static_power)

		return 0;



	opp = dev_pm_opp_find_freq_exact(dev, freq, true);

	if (PTR_ERR(opp) == -ERANGE)

		opp = dev_pm_opp_find_freq_exact(dev, freq, false);
@@ -202,9 +187,35 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq) 
		dev_err_ratelimited(dev,

				    "Failed to get voltage for frequency %lu\n",

				    freq);

		return 0;

	}



	return voltage;

}



/**

 * get_static_power() - calculate the static power

 * @dfc:	Pointer to devfreq cooling device

 * @freq:	Frequency in Hz

 *

 * Calculate the static power in milliwatts using the supplied

 * get_static_power().  The current voltage is calculated using the

 * OPP library.  If no get_static_power() was supplied, assume the

 * static power is negligible.

 */

static unsigned long

get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq)

{

	struct devfreq *df = dfc->devfreq;

	unsigned long voltage;



	if (!dfc->power_ops->get_static_power)

		return 0;



	voltage = get_voltage(df, freq);



	if (voltage == 0)

		return 0;



	return dfc->power_ops->get_static_power(df, voltage);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE