x86, apic: refactor ->phys_pkg_id()

Refactor the ->phys_pkg_id() methods:

 - namespace separation

 - macro wrapper removal

 - open-coded calls to the methods in the generic code

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

5 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index e151b472456f..d04b38954df3 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -87,7 +87,7 @@ struct genapic apic_bigsmp = {
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = bigsmp_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
-        .phys_pkg_id                    = phys_pkg_id,
+        .phys_pkg_id                    = bigsmp_phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index ac6be195b977..5c9266f756e0 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -68,7 +68,7 @@ struct genapic apic_default = {
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
-        .phys_pkg_id                    = phys_pkg_id,
+        .phys_pkg_id                    = default_phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 1185964b7a33..52787e34c9cc 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -122,7 +122,7 @@ struct genapic apic_es7000 = {
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = es7000_check_phys_apicid_present,
         .enable_apic_mode               = es7000_enable_apic_mode,
-        .phys_pkg_id                    = phys_pkg_id,
+        .phys_pkg_id                    = es7000_phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 8d3358de3fe7..6a1134e6d72d 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -87,7 +87,7 @@ struct genapic apic_numaq = {
         .setup_portio_remap             = numaq_setup_portio_remap,
         .check_phys_apicid_present      = numaq_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
-        .phys_pkg_id                    = phys_pkg_id,
+        .phys_pkg_id                    = numaq_phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index cb83bcbb2dec..2d6843a61d97 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -67,7 +67,7 @@ struct genapic apic_summit = {
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = summit_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
-        .phys_pkg_id                    = phys_pkg_id,
+        .phys_pkg_id                    = summit_phys_pkg_id,
         .mps_oem_check                  = mps_oem_check,
 
         .get_apic_id                    = get_apic_id,