summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiezhu Yang <yangtiezhu@loongson.cn>2020-04-21 13:59:45 +0200
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-04-21 16:07:14 +0200
commit2a3d47c94ebdfb97bd8aa95343c58b679cb11724 (patch)
treea09679ab5366029c72b1391d8fd242934a548b88
parentMIPS: Do not initialise globals to 0 (diff)
downloadlinux-2a3d47c94ebdfb97bd8aa95343c58b679cb11724.tar.xz
linux-2a3d47c94ebdfb97bd8aa95343c58b679cb11724.zip
MIPS: Cleanup code about plat_mem_setup()
In the current code, plat_mem_setup() is called by arch_mem_init() instead of setup_arch() and has been declared in asm/bootinfo.h, so modify the code comment to reflect the reality and remove the useless duplicate declartion in arch/mips/kernel/setup.c. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-rw-r--r--arch/mips/include/asm/bootinfo.h2
-rw-r--r--arch/mips/kernel/setup.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 61727785a247..dcd6a75277d1 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -121,7 +121,7 @@ extern unsigned long fw_passed_dtb;
#endif
/*
- * Platform memory detection hook called by setup_arch
+ * Platform memory detection hook called by arch_mem_init()
*/
extern void plat_mem_setup(void);
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index b1e2d4360383..5481a0c68521 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -654,8 +654,6 @@ static void __init bootcmdline_init(char **cmdline_p)
*/
static void __init arch_mem_init(char **cmdline_p)
{
- extern void plat_mem_setup(void);
-
/* call board setup routine */
plat_mem_setup();
memblock_set_bottom_up(true);