Skip to content

Commit 7a5f008

Browse files
committed
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>
2 parents 8af11ee + 919c385 commit 7a5f008

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

arch/arm/mach-shmobile/rcar-gen2.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#ifndef __ASM_RCAR_GEN2_H__
33
#define __ASM_RCAR_GEN2_H__
44

5-
void rcar_gen2_timer_init(void);
6-
void rcar_gen2_reserve(void);
75
void rcar_gen2_pm_init(void);
86

97
#endif /* __ASM_RCAR_GEN2_H__ */

arch/arm/mach-shmobile/setup-rcar-gen2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static unsigned int __init get_extal_freq(void)
5959
#define CNTCR 0
6060
#define CNTFID0 0x20
6161

62-
void __init rcar_gen2_timer_init(void)
62+
static void __init rcar_gen2_timer_init(void)
6363
{
6464
bool need_update = true;
6565
void __iomem *base;
@@ -174,7 +174,7 @@ static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname,
174174
return 0;
175175
}
176176

177-
void __init rcar_gen2_reserve(void)
177+
static void __init rcar_gen2_reserve(void)
178178
{
179179
struct memory_reserve_config mrc;
180180

0 commit comments

Comments
 (0)