Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b20e5a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 49040333

arch/x86/include/asm/es7000/apic.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static inline unsigned long es7000_check_apicid_present(int bit) 
	return physid_isset(bit, phys_cpu_present_map);

}



extern void es7000_enable_apic_mode(void);



#define apicid_cluster(apicid) (apicid & 0xF0)



static inline unsigned long calculate_ldr(int cpu)

arch/x86/kernel/es7000_32.c

+14 −13
Original line number Diff line number Diff line
@@ -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;

	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_sw_apic: command failed, status = %x\n",

       	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);

		return;

	}

}

arch/x86/mach-generic/es7000.c

+0 −7
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ static int probe_es7000(void) 
	return 0;

}



extern void es7000_sw_apic(void);



static void __init es7000_enable_apic_mode(void)

{

	es7000_sw_apic();

}



static __init int

mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)

{