summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2016-03-15 16:18:56 +0100
committersy1124.kim <sy1124.kim@samsung.com>2016-08-24 16:21:05 +0900
commit3cac887222bee19fd6dc2183eef3ffdb4e6b5717 (patch)
treeb832ff411de80cb2693b477230dc0e6cceefe21d
parent9853423b6972d6c5698742347af661045dda4788 (diff)
downloadlinux-3.10-artik-3cac887222bee19fd6dc2183eef3ffdb4e6b5717.tar.gz
linux-3.10-artik-3cac887222bee19fd6dc2183eef3ffdb4e6b5717.tar.bz2
linux-3.10-artik-3cac887222bee19fd6dc2183eef3ffdb4e6b5717.zip
gpu: arm: midgard: r12p0_04rel0: Fix 'struct devfreq_cooling_ops' related compilation break
There is no 'struct devfreq_cooling_ops' in current kernel tree and 'struct devfreq_cooling_power' seems to be an equivalent of it. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> [jy0922.shim: apply to midgard r12p0_04rel0] Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Change-Id: I90616ef8c3ae11f69ed73a0d1392c0e837702914
-rw-r--r--drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.c2
-rw-r--r--drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.c b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.c
index ebe65c414f0..f536fe69fc1 100644
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.c
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.c
@@ -85,7 +85,7 @@ static unsigned long model_dynamic_power(unsigned long freq,
return (dynamic_coefficient * v2 * f_mhz) / 1000000; /* mW */
}
-struct devfreq_cooling_ops power_model_simple_ops = {
+struct devfreq_cooling_power power_model_simple_ops = {
.get_static_power = model_static_power,
.get_dynamic_power = model_dynamic_power,
};
diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.h b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.h
index d20de1ef617..17eede4d917 100644
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.h
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_power_model_simple.h
@@ -38,6 +38,6 @@
*/
int kbase_power_model_simple_init(struct kbase_device *kbdev);
-extern struct devfreq_cooling_ops power_model_simple_ops;
+extern struct devfreq_cooling_power power_model_simple_ops;
#endif /* _BASE_POWER_MODEL_SIMPLE_H_ */