[PATCH] ARM: shmobile: rcar-gen2: Make rcar_gen2_{timer_init, reserve}() static

[PATCH] ARM: shmobile: rcar-gen2: Make rcar_gen2_{timer_init, reserve}() static

[Geert Uytterhoeven]

As of commit 1e90fea35b80cfe1 ("ARM: shmobile: r8a7791: Use common R-Car
Gen2 machine definition"), there are no more users of
rcar_gen2_timer_init() and rcar_gen2_reserve() outside
arch/arm/mach-shmobile/setup-rcar-gen2.c.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To be queued in renesas-devel for v5.10.

 arch/arm/mach-shmobile/rcar-gen2.h       | 2 --
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h
index 4777fff2de413b7e..af9dbd6aa49e4d30 100644
--- a/arch/arm/mach-shmobile/rcar-gen2.h
+++ b/arch/arm/mach-shmobile/rcar-gen2.h
@@ -2,8 +2,6 @@
 #ifndef __ASM_RCAR_GEN2_H__
 #define __ASM_RCAR_GEN2_H__
 
-void rcar_gen2_timer_init(void);
-void rcar_gen2_reserve(void);
 void rcar_gen2_pm_init(void);
 
 #endif /* __ASM_RCAR_GEN2_H__ */
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index fa1b00547d164b42..287dcbdb20de493a 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -61,7 +61,7 @@ static unsigned int __init get_extal_freq(void)
 #define CNTCR 0
 #define CNTFID0 0x20
 
-void __init rcar_gen2_timer_init(void)
+static void __init rcar_gen2_timer_init(void)
 {
 	bool need_update = true;
 	void __iomem *base;
@@ -193,7 +193,7 @@ static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname,
 	return 0;
 }
 
-void __init rcar_gen2_reserve(void)
+static void __init rcar_gen2_reserve(void)
 {
 	struct memory_reserve_config mrc;
 
-- 
2.17.1


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

Re: [PATCH] ARM: shmobile: rcar-gen2: Make rcar_gen2_{timer_init,reserve}() static

[Niklas Söderlund]

Hi Geert,

Thanks for your patch.

On 2020-09-08 09:44:03 +0200, Geert Uytterhoeven wrote:
> As of commit 1e90fea35b80cfe1 ("ARM: shmobile: r8a7791: Use common R-Car
> Gen2 machine definition"), there are no more users of
> rcar_gen2_timer_init() and rcar_gen2_reserve() outside
> arch/arm/mach-shmobile/setup-rcar-gen2.c.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
> To be queued in renesas-devel for v5.10.
> 
>  arch/arm/mach-shmobile/rcar-gen2.h       | 2 --
>  arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h
> index 4777fff2de413b7e..af9dbd6aa49e4d30 100644
> --- a/arch/arm/mach-shmobile/rcar-gen2.h
> +++ b/arch/arm/mach-shmobile/rcar-gen2.h
> @@ -2,8 +2,6 @@
>  #ifndef __ASM_RCAR_GEN2_H__
>  #define __ASM_RCAR_GEN2_H__
>  
> -void rcar_gen2_timer_init(void);
> -void rcar_gen2_reserve(void);
>  void rcar_gen2_pm_init(void);
>  
>  #endif /* __ASM_RCAR_GEN2_H__ */
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index fa1b00547d164b42..287dcbdb20de493a 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -61,7 +61,7 @@ static unsigned int __init get_extal_freq(void)
>  #define CNTCR 0
>  #define CNTFID0 0x20
>  
> -void __init rcar_gen2_timer_init(void)
> +static void __init rcar_gen2_timer_init(void)
>  {
>  	bool need_update = true;
>  	void __iomem *base;
> @@ -193,7 +193,7 @@ static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname,
>  	return 0;
>  }
>  
> -void __init rcar_gen2_reserve(void)
> +static void __init rcar_gen2_reserve(void)
>  {
>  	struct memory_reserve_config mrc;
>  
> -- 
> 2.17.1
> 

-- 
Regards,
Niklas Söderlund

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