From 13166f7a46e895b6ee9d4c866d9f0485f6b8ef6b Mon Sep 17 00:00:00 2001 From: Christoph Muellner Date: Mon, 12 Nov 2018 17:28:17 +0100 Subject: gpu: mali: Fix signature of kbase_get_[static|dynamic]_power functions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This addresses a type warning, which elevates to a broken build because of -Werror: CC drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.o drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c:582:22: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] error, forbidden warning:mali_kbase_ipa.c:582 .get_static_power = &kbase_get_static_power, ^ drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c:582:22: note: (near initialization for ‘kbase_ipa_power_model_ops.get_static_power’) drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c:583:23: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] error, forbidden warning:mali_kbase_ipa.c:583 .get_dynamic_power = &kbase_get_dynamic_power, ^ drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c:583:23: note: (near initialization for ‘kbase_ipa_power_model_ops.get_dynamic_power’) scripts/Makefile.build:277: recipe for target 'drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.o' failed Signed-off-by: Christoph Muellner --- drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c index 01bdbb4e8eb1..f22379f4ba51 100644 --- a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -462,7 +462,8 @@ static u32 get_static_power_locked(struct kbase_device *kbdev, static unsigned long kbase_get_static_power(struct devfreq *df, unsigned long voltage) #else -static unsigned long kbase_get_static_power(unsigned long voltage) +static unsigned long kbase_get_static_power(struct devfreq *df, + unsigned long voltage) #endif { struct kbase_ipa_model *model; @@ -492,7 +493,8 @@ static unsigned long kbase_get_dynamic_power(struct devfreq *df, unsigned long freq, unsigned long voltage) #else -static unsigned long kbase_get_dynamic_power(unsigned long freq, +static unsigned long kbase_get_dynamic_power(struct devfreq *df, + unsigned long freq, unsigned long voltage) #endif { -- cgit v1.2.3