summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2016-09-15 15:44:23 +0100
committerTao Huang <huangtao@rock-chips.com>2018-01-04 09:22:34 +0800
commit5dcb4226bb3be808462bd5db4d693149fe633c4b (patch)
tree4a7fd2be902e74eaef9bf9d83d2836205caf1bda /drivers/staging
parentece9e5b00249694e8a5f2d87f4354bf891018c3a (diff)
BACKPORT: devfreq_cooling: pass a pointer to devfreq in the power model callbacks
When the devfreq cooling device was designed, it was an oversight not to pass a pointer to the struct devfreq as the first parameters of the callbacks. The design patterns of the kernel suggest it for a good reason. By passing a pointer to struct devfreq, the driver can register one function that works with multiple devices. With the current implementation, a driver that can work with multiple devices has to create multiple copies of the same function with different parameters so that each devfreq_cooling_device can use the appropriate one. By passing a pointer to struct devfreq, the driver can identify which device it's referring to. Change-Id: I384bf9aafd2391eccab2ca6a76e4e57f2740aa6b Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Reviewed-by: Punit Agrawal <punit.agrawal@arm.com> Reviewed-by: Ørjan Eide <orjan.eide@arm.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Signed-off-by: Javi Merino <javi.merino@arm.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com> Signed-off-by: Tao Huang <huangtao@rock-chips.com> (cherry picked from commit 3aa5374376746f20a27be8682be7f91c8b71d1d8)
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c b/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
index 553d0c1377e5..dbb9f9f0b32b 100644
--- a/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
+++ b/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
@@ -436,7 +436,8 @@ static u32 static_coefficient;
static s32 ts[4];
static struct thermal_zone_device *gpu_tz;
-static unsigned long model_static_power(unsigned long voltage)
+static unsigned long model_static_power(struct devfreq *devfreq,
+ unsigned long voltage)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
unsigned long temperature;
@@ -477,7 +478,8 @@ static unsigned long model_static_power(unsigned long voltage)
/ 1000000;
}
-static unsigned long model_dynamic_power(unsigned long freq,
+static unsigned long model_dynamic_power(struct devfreq *devfreq,
+ unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.