x86, apic: refactor ->get_apic_id() & GET_APIC_ID()

- spread out the namespace on a per driver basis

 - get rid of macro wrappers

 - small cleanups

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 6bf6aafeb2c6..9eca977227c4 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -90,7 +90,7 @@ struct genapic apic_bigsmp = {
         .phys_pkg_id                    = bigsmp_phys_pkg_id,
         .mps_oem_check                  = NULL,
 
-        .get_apic_id                    = get_apic_id,
+        .get_apic_id                    = bigsmp_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = APIC_ID_MASK,
 
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index e5f85cd75b43..d51a3f0335ae 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -71,7 +71,7 @@ struct genapic apic_default = {
         .phys_pkg_id                    = default_phys_pkg_id,
         .mps_oem_check                  = NULL,
 
-        .get_apic_id                    = get_apic_id,
+        .get_apic_id                    = default_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = APIC_ID_MASK,
 
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index f861163cd396..1944675db629 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -126,7 +126,7 @@ struct genapic apic_es7000 = {
         .phys_pkg_id                    = es7000_phys_pkg_id,
         .mps_oem_check                  = es7000_mps_oem_check,
 
-        .get_apic_id                    = get_apic_id,
+        .get_apic_id                    = es7000_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = APIC_ID_MASK,
 
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 517882c9c15a..fcbba84c090f 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -90,7 +90,7 @@ struct genapic apic_numaq = {
         .phys_pkg_id                    = numaq_phys_pkg_id,
         .mps_oem_check                  = __numaq_mps_oem_check,
 
-        .get_apic_id                    = get_apic_id,
+        .get_apic_id                    = numaq_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = APIC_ID_MASK,
 
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 719e944ff308..5650eaf9061f 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -70,7 +70,7 @@ struct genapic apic_summit = {
         .phys_pkg_id                    = summit_phys_pkg_id,
         .mps_oem_check                  = summit_mps_oem_check,
 
-        .get_apic_id                    = get_apic_id,
+        .get_apic_id                    = summit_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = APIC_ID_MASK,