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

Commit efec3b9a authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] Fix up some non linuxy style in ACPI functions in mpparse.c 



No functional changes.

Cc: len.brown@intel.com
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 276ec1a7

arch/x86_64/kernel/mpparse.c

+16 −41
Original line number Diff line number Diff line
@@ -614,23 +614,17 @@ void __init find_smp_config(void) 


#ifdef CONFIG_ACPI



void __init mp_register_lapic_address (

	u64			address)

void __init mp_register_lapic_address(u64 address)

{

	mp_lapic_addr = (unsigned long) address;



	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);



	if (boot_cpu_id == -1U)

		boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));



	Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid);

}





void __cpuinit mp_register_lapic (

	u8			id, 

	u8			enabled)

void __cpuinit mp_register_lapic (u8 id, u8 enabled)

{

	struct mpc_config_processor processor;

	int			boot_cpu = 0;
@@ -668,9 +662,7 @@ static struct mp_ioapic_routing { 
	u32			pin_programmed[4];

} mp_ioapic_routing[MAX_IO_APICS];





static int mp_find_ioapic (

	int			gsi)

static int mp_find_ioapic(int gsi)

{

	int i = 0;
@@ -682,15 +674,10 @@ static int mp_find_ioapic ( 
	}



	printk(KERN_ERR "ERROR: Unable to locate IOAPIC for GSI %d\n", gsi);



	return -1;

}





void __init mp_register_ioapic (

	u8			id, 

	u32			address,

	u32			gsi_base)

void __init mp_register_ioapic(u8 id, u32 address, u32 gsi_base)

{

	int idx = 0;
@@ -729,16 +716,10 @@ void __init mp_register_ioapic ( 
		mp_ioapics[idx].mpc_apicver, mp_ioapics[idx].mpc_apicaddr,

		mp_ioapic_routing[idx].gsi_start,

		mp_ioapic_routing[idx].gsi_end);



	return;

}





void __init mp_override_legacy_irq (

	u8			bus_irq,

	u8			polarity, 

	u8			trigger, 

	u32			gsi)

void __init

mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32	gsi)

{

	struct mpc_config_intsrc intsrc;

	int			ioapic = -1;
@@ -776,11 +757,8 @@ void __init mp_override_legacy_irq ( 
	mp_irqs[mp_irq_entries] = intsrc;

	if (++mp_irq_entries == MAX_IRQ_SOURCES)

		panic("Max # of irq sources exceeded!\n");



	return;

}





void __init mp_config_acpi_legacy_irqs(void)

{

	struct mpc_config_intsrc intsrc;
@@ -843,8 +821,6 @@ void __init mp_config_acpi_legacy_irqs (void) 
		if (++mp_irq_entries == MAX_IRQ_SOURCES)

			panic("Max # of irq sources exceeded!\n");

	}



	return;

}



#define MAX_GSI_NUM	4096
@@ -934,5 +910,4 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) 
		polarity == ACPI_ACTIVE_HIGH ? 0 : 1);

	return gsi;

}



#endif /*CONFIG_ACPI*/