Commit 7a5f0085 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm-soc-for-v5.10-tag1' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 8af11ee9 919c385d

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

+0 −2
Original line number Diff line number Diff line
@@ -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__ */

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE