x86, apic: rename 'genapic' to 'apic'

Impact: cleanup

Now that all APIC code is consolidated there's nothing 'gen' about
apics anymore - so rename 'struct genapic' to 'struct apic'.

This shortens the code and is nicer to read as well.

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

1 files changed, 18 insertions, 18 deletions

diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 5914ffb6e408..5fa48332c5c8 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -78,7 +78,7 @@ static int probe_default(void)
         return 1;
 }
 
-struct genapic apic_default = {
+struct apic apic_default = {
 
         .name                           = "default",
         .probe                          = probe_default,
@@ -141,16 +141,16 @@ struct genapic apic_default = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 };
 
-extern struct genapic apic_numaq;
-extern struct genapic apic_summit;
-extern struct genapic apic_bigsmp;
-extern struct genapic apic_es7000;
-extern struct genapic apic_default;
+extern struct apic apic_numaq;
+extern struct apic apic_summit;
+extern struct apic apic_bigsmp;
+extern struct apic apic_es7000;
+extern struct apic apic_default;
 
-struct genapic *apic = &apic_default;
+struct apic *apic = &apic_default;
 EXPORT_SYMBOL_GPL(apic);
 
-static struct genapic *apic_probe[] __initdata = {
+static struct apic *apic_probe[] __initdata = {
 #ifdef CONFIG_X86_NUMAQ
         &apic_numaq,
 #endif
@@ -183,8 +183,8 @@ static int __init parse_apic(char *arg)
                 }
         }
 
-        if (x86_quirks->update_genapic)
-                x86_quirks->update_genapic();
+        if (x86_quirks->update_apic)
+                x86_quirks->update_apic();
 
         /* Parsed again by __setup for debug/verbose */
         return 0;
@@ -204,8 +204,8 @@ void __init generic_bigsmp_probe(void)
         if (!cmdline_apic && apic == &apic_default) {
                 if (apic_bigsmp.probe()) {
                         apic = &apic_bigsmp;
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
+                        if (x86_quirks->update_apic)
+                                x86_quirks->update_apic();
                         printk(KERN_INFO "Overriding APIC driver with %s\n",
                                apic->name);
                 }
@@ -227,8 +227,8 @@ void __init generic_apic_probe(void)
                 if (!apic_probe[i])
                         panic("Didn't find an APIC driver");
 
-                if (x86_quirks->update_genapic)
-                        x86_quirks->update_genapic();
+                if (x86_quirks->update_apic)
+                        x86_quirks->update_apic();
         }
         printk(KERN_INFO "Using APIC driver %s\n", apic->name);
 }
@@ -248,8 +248,8 @@ generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 
                 if (!cmdline_apic) {
                         apic = apic_probe[i];
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
+                        if (x86_quirks->update_apic)
+                                x86_quirks->update_apic();
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }
@@ -270,8 +270,8 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
                 if (!cmdline_apic) {
                         apic = apic_probe[i];
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
+                        if (x86_quirks->update_apic)
+                                x86_quirks->update_apic();
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }