x86, es7000: clean up es7000_enable_apic_mode()

- eliminate the needless es7000_enable_apic_mode() complication which
  was not apparent prior the namespace cleanups

- clean up the control flow in es7000_enable_apic_mode()

- other cleanups

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

1 files changed, 14 insertions, 13 deletions

diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c
index 20a2a43c2a9c..e73fe18488ac 100644
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -359,20 +359,21 @@ es7000_mip_write(struct mip_reg *mip_reg)
         return status;
 }
 
-void __init
-es7000_sw_apic(void)
+void __init es7000_enable_apic_mode(void)
 {
-        if (es7000_plat) {
-                int mip_status;
-                struct mip_reg es7000_mip_reg;
-
-                printk("ES7000: Enabling APIC mode.\n");
-                memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
-                es7000_mip_reg.off_0 = MIP_SW_APIC;
-                es7000_mip_reg.off_38 = (MIP_VALID);
-                while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0)
-                        printk("es7000_sw_apic: command failed, status = %x\n",
-                                mip_status);
+        struct mip_reg es7000_mip_reg;
+        int mip_status;
+
+        if (!es7000_plat)
                 return;
+
+        printk("ES7000: Enabling APIC mode.\n");
+        memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
+        es7000_mip_reg.off_0 = MIP_SW_APIC;
+        es7000_mip_reg.off_38 = MIP_VALID;
+
+        while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) {
+                printk("es7000_enable_apic_mode: command failed, status = %x\n",
+                        mip_status);
         }
 }