Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type
@ 2019-06-18  9:48 Arnd Bergmann
  2019-06-18  9:52 ` Andrew Murray
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2019-06-18  9:48 UTC (permalink / raw)
  To: Daniel Lezcano
  Cc: Mark Rutland, Arnd Bergmann, Marc Zyngier, Will Deacon,
	Russell King, linux-kernel, Andrew Murray, linux-arm-kernel

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(-)

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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type
  2019-06-18  9:48 [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type Arnd Bergmann
@ 2019-06-18  9:52 ` Andrew Murray
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Murray @ 2019-06-18  9:52 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Mark Rutland, Marc Zyngier, Daniel Lezcano, Will Deacon,
	Russell King, linux-kernel, linux-arm-kernel

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
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-18  9:48 [PATCH] clocksource/arm_arch_timer: fix arch_timer_set_evtstrm_feature return type Arnd Bergmann
2019-06-18  9:52 ` Andrew Murray

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org infradead-linux-arm-kernel@archiver.kernel.org
	public-inbox-index linux-arm-kernel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox