aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 07:15:06 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-28 17:20:26 -0500
commitb0b20e5a3a6615ae750804523aeedd32911bb9d6 (patch)
tree73c0ed9201c7f970dc939919785b3d6bb641ebac /arch/x86/kernel
parent4904033302c745342e3b3a611881cdee57fbe06a (diff)
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>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/es7000_32.c27
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)
359 return status; 359 return status;
360} 360}
361 361
362void __init 362void __init es7000_enable_apic_mode(void)
363es7000_sw_apic(void)
364{ 363{
365 if (es7000_plat) { 364 struct mip_reg es7000_mip_reg;
366 int mip_status; 365 int mip_status;
367 struct mip_reg es7000_mip_reg; 366
368 367 if (!es7000_plat)
369 printk("ES7000: Enabling APIC mode.\n");
370 memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
371 es7000_mip_reg.off_0 = MIP_SW_APIC;
372 es7000_mip_reg.off_38 = (MIP_VALID);
373 while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0)
374 printk("es7000_sw_apic: command failed, status = %x\n",
375 mip_status);
376 return; 368 return;
369
370 printk("ES7000: Enabling APIC mode.\n");
371 memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
372 es7000_mip_reg.off_0 = MIP_SW_APIC;
373 es7000_mip_reg.off_38 = MIP_VALID;
374
375 while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) {
376 printk("es7000_enable_apic_mode: command failed, status = %x\n",
377 mip_status);
377 } 378 }
378} 379}