x86: refactor ->enable_apic_mode() subarch methods

Only ES7000 has a real ->enable_apic_mode() method, the other
subarchitectures define it but keep it empty.

So mark the vector as NULL, extend the generic code to handle
NULL -setup_portio_remap() entries and remove all the empty
handlers.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 7 insertions, 7 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 82743d16c23d..e151b472456f 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -86,7 +86,7 @@ struct genapic apic_bigsmp = {
         .apicid_to_cpu_present          = bigsmp_apicid_to_cpu_present,
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = bigsmp_check_phys_apicid_present,
-        .enable_apic_mode               = enable_apic_mode,
+        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index d0374c69ad01..ac6be195b977 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -67,7 +67,7 @@ struct genapic apic_default = {
         .apicid_to_cpu_present          = default_apicid_to_cpu_present,
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = enable_apic_mode,
+        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 52b3eb5e645f..9acb71120ef6 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -36,10 +36,10 @@ static int probe_es7000(void)
 }
 
 extern void es7000_sw_apic(void);
-static void __init enable_apic_mode(void)
+
+static void __init es7000_enable_apic_mode(void)
 {
         es7000_sw_apic();
-        return;
 }
 
 static __init int
@@ -128,7 +128,7 @@ struct genapic apic_es7000 = {
         .apicid_to_cpu_present          = es7000_apicid_to_cpu_present,
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = es7000_check_phys_apicid_present,
-        .enable_apic_mode               = enable_apic_mode,
+        .enable_apic_mode               = es7000_enable_apic_mode,
         .phys_pkg_id                    = phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 7ec2ca43ca20..8d3358de3fe7 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -86,7 +86,7 @@ struct genapic apic_numaq = {
         .apicid_to_cpu_present          = numaq_apicid_to_cpu_present,
         .setup_portio_remap             = numaq_setup_portio_remap,
         .check_phys_apicid_present      = numaq_check_phys_apicid_present,
-        .enable_apic_mode               = enable_apic_mode,
+        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index acf12de8916f..cb83bcbb2dec 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -66,7 +66,7 @@ struct genapic apic_summit = {
         .apicid_to_cpu_present          = summit_apicid_to_cpu_present,
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = summit_check_phys_apicid_present,
-        .enable_apic_mode               = enable_apic_mode,
+        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,