diff mbox series

clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type

Message ID 20190618094835.3709679-1-arnd@arndb.de
State New
Headers show
Series clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type | expand

Commit Message

Arnd Bergmann June 18, 2019, 9:48 a.m. UTC 
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@arndb.de>

---
 arch/arm/include/asm/arch_timer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Andrew Murray June 18, 2019, 9:52 a.m. UTC | #1 
On Tue, Jun 18, 2019 at 11:48:27AM +0200, Arnd Bergmann wrote:
> This looks like it was copied incorrectly from arm64:


Hi Arnd,

Yes that's correct. I sent a patch for this yesterday [1], I believe Daniel
plans to take this through his tree.

[1] https://lkml.org/lkml/2019/6/17/229

Thanks,

Andrew Murray

> 

> 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@arndb.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

>
diff mbox series

Patch

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;
 }