diff options
| author | Olof Johansson <olof@lixom.net> | 2020-09-26 12:36:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-09-26 12:36:59 -0700 |
| commit | 7a5f0085db9247271c059525eca7baa193201a39 (patch) | |
| tree | 0827c549f95cc4ca4cc02d8700e439ae5a050b47 | |
| parent | 8af11ee90cd530c64f0523cdb7c5747cd25c89bc (diff) | |
| parent | 919c385dde9cdd4775688205e29fc53131a6b3ff (diff) | |
| download | lwn-7a5f0085db9247271c059525eca7baa193201a39.tar.gz lwn-7a5f0085db9247271c059525eca7baa193201a39.zip | |
Merge tag 'renesas-arm-soc-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc
Renesas ARM SoC updates for v5.10
- Make two local functions static.
* tag 'renesas-arm-soc-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
ARM: shmobile: rcar-gen2: Make rcar_gen2_{timer_init, reserve}() static
Link: https://lore.kernel.org/r/20200918124800.15555-3-geert+renesas@glider.be
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-shmobile/rcar-gen2.h | 2 | ||||
| -rw-r--r-- | 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 4777fff2de41..af9dbd6aa49e 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 c42ff8c314c8..07866e4885cc 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -59,7 +59,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; @@ -174,7 +174,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; |