The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: f2739ca15c414ebad88f4333e3186fd4144c1753
Gitweb: https://git.kernel.org/tip/f2739ca15c414ebad88f4333e3186fd4144c1753
Author: Rob Herring <robh@xxxxxxxxxx>
AuthorDate: Fri, 22 Oct 2021 11:46:42 -05:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 25 Oct 2021 10:56:37 +02:00
x86/of: Kill unused early_init_dt_scan_chosen_arch()
There are no callers for early_init_dt_scan_chosen_arch(), so remove it.
Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Frank Rowand <frank.rowand@xxxxxxxx>
Link: https://lkml.kernel.org/r/20211022164642.2815706-1-robh@xxxxxxxxxx
---
arch/x86/kernel/devicetree.c | 5 -----
include/linux/of_fdt.h | 1 -
2 files changed, 6 deletions(-)
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 6a4cb71..78b2311 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -31,11 +31,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE];
int __initdata of_ioapic;
-void __init early_init_dt_scan_chosen_arch(unsigned long node)
-{
- BUG();
-}
-
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
{
BUG();
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index cf6a65b..cf48983 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -65,7 +65,6 @@ extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
extern int early_init_dt_scan_chosen_stdout(void);
extern void early_init_fdt_scan_reserved_mem(void);
extern void early_init_fdt_reserve_self(void);
-extern void __init early_init_dt_scan_chosen_arch(unsigned long node);
extern void early_init_dt_add_memory_arch(u64 base, u64 size);
extern u64 dt_mem_next_cell(int s, const __be32 **cellp);
|