[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190618094835.3709679-1-arnd@arndb.de>
Date: Tue, 18 Jun 2019 11:48:27 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Arnd Bergmann <arnd@...db.de>,
Andrew Murray <andrew.murray@....com>,
Mark Rutland <mark.rutland@....com>,
Will Deacon <will.deacon@....com>,
Marc Zyngier <marc.zyngier@....com>,
Russell King <linux@...linux.org.uk>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type
This looks like it was copied incorrectly from arm64:
In file included from /git/arm-soc/drivers/clocksource/arm_arch_timer.c:31:
arch/arm/include/asm/arch_timer.h:131:1: error: control reaches end of non-void function [-Werror,-Wreturn-type]
Change the type to 'void' as it should be.
Fixes: 11e34eca5d0a ("clocksource/arm_arch_timer: Extract elf_hwcap use to arch-helper")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
arch/arm/include/asm/arch_timer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index ae533caec1e9..99175812d903 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -125,7 +125,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
isb();
}
-static inline bool arch_timer_set_evtstrm_feature(void)
+static inline void arch_timer_set_evtstrm_feature(void)
{
elf_hwcap |= HWCAP_EVTSTRM;
}
--
2.20.0
Powered by blists - more mailing lists