[tip: x86/platform] x86/of: Change x86_dtb_parse_smp_config() to static
From: tip-bot2 for Saurabh Sengar
Date: Wed Apr 03 2024 - 03:00:17 EST
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: f87136c05714836f1b659365443caccc1bbfce2d
Gitweb: https://git.kernel.org/tip/f87136c05714836f1b659365443caccc1bbfce2d
Author: Saurabh Sengar <ssengar@xxxxxxxxxxxxxxxxxxx>
AuthorDate: Tue, 02 Apr 2024 07:40:30 -07:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 03 Apr 2024 08:49:56 +02:00
x86/of: Change x86_dtb_parse_smp_config() to static
x86_dtb_parse_smp_config() is called locally only, change it to static.
Signed-off-by: Saurabh Sengar <ssengar@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1712068830-4513-5-git-send-email-ssengar@xxxxxxxxxxxxxxxxxxx
---
arch/x86/include/asm/prom.h | 2 --
arch/x86/kernel/devicetree.c | 18 +++++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 02644e0..365798c 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -23,12 +23,10 @@ extern int of_ioapic;
extern u64 initial_dtb;
extern void add_dtb(u64 data);
void x86_of_pci_init(void);
-void x86_dtb_parse_smp_config(void);
void x86_flattree_get_config(void);
#else
static inline void add_dtb(u64 data) { }
static inline void x86_of_pci_init(void) { }
-static inline void x86_dtb_parse_smp_config(void) { }
static inline void x86_flattree_get_config(void) { }
#define of_ioapic 0
#endif
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index b93ce8a..8e3c53b 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -279,6 +279,15 @@ static void __init dtb_apic_setup(void)
dtb_ioapic_setup();
}
+static void __init x86_dtb_parse_smp_config(void)
+{
+ if (!of_have_populated_dt())
+ return;
+
+ dtb_setup_hpet();
+ dtb_apic_setup();
+}
+
void __init x86_flattree_get_config(void)
{
#ifdef CONFIG_OF_EARLY_FLATTREE
@@ -307,12 +316,3 @@ void __init x86_flattree_get_config(void)
if (of_have_populated_dt())
x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;
}
-
-void __init x86_dtb_parse_smp_config(void)
-{
- if (!of_have_populated_dt())
- return;
-
- dtb_setup_hpet();
- dtb_apic_setup();
-}