x86, smp: clean up mps_oem_check()

Impact: cleanup

 - allow NULL ->mps_oem_check() entries

 - clean up the code flow

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

diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index 14b19de8cd09caf49066937752e7c10000a6cd8f..8bb1c73c55b7ded4b89f4a0f61c2d79d87ab394b 100644 (file)
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -55,8 +55,7 @@ struct genapic {
         * is switched to this. Essentially they are additional
         * probe functions:
         */
-       int (*mps_oem_check)(struct mpc_table *mpc, char *oem,
-                            char *productid);
+       int (*mps_oem_check)(struct mpc_table *mpc, char *oem, char *productid);
 
        unsigned int (*get_apic_id)(unsigned long x);
        unsigned long (*set_apic_id)(unsigned int id);

diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index a21e2b1a701110209a767767f397e420c9dd357f..799a70f4d90e8ff5dc2ac26985ae4bd96eaa7136 100644 (file)
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -113,17 +113,21 @@ void __init generic_apic_probe(void)
 int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
        int i;
+
        for (i = 0; apic_probe[i]; ++i) {
-               if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) {
-                       if (!cmdline_apic) {
-                               apic = apic_probe[i];
-                               if (x86_quirks->update_genapic)
-                                       x86_quirks->update_genapic();
-                               printk(KERN_INFO "Switched to APIC driver `%s'.\n",
-                                      apic->name);
-                       }
-                       return 1;
+               if (!apic_probe[i]->mps_oem_check)
+                       continue;
+               if (!apic_probe[i]->mps_oem_check(mpc, oem, productid))
+                       continue;
+
+               if (!cmdline_apic) {
+                       apic = apic_probe[i];
+                       if (x86_quirks->update_genapic)
+                               x86_quirks->update_genapic();
+                       printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+                              apic->name);
                }
+               return 1;
        }
        return 0;
 }