Commit 6ebcc00e authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] i386/x86-64: simplify ioapic_register_intr() 



Simplify (remove duplication of) code in ioapic_register_intr().

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0a1ad60d

arch/i386/kernel/io_apic.c

+8 −15
Original line number Diff line number Diff line
@@ -1205,21 +1205,14 @@ static struct hw_interrupt_type ioapic_edge_type; 


static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)

{

	if (use_pci_vector() && !platform_legacy_irq(irq)) {

		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

				trigger == IOAPIC_LEVEL)

			irq_desc[vector].handler = &ioapic_level_type;

		else

			irq_desc[vector].handler = &ioapic_edge_type;

		set_intr_gate(vector, interrupt[vector]);

	} else	{

	unsigned idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;



	if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

			trigger == IOAPIC_LEVEL)

			irq_desc[irq].handler = &ioapic_level_type;

		irq_desc[idx].handler = &ioapic_level_type;

	else

			irq_desc[irq].handler = &ioapic_edge_type;

		set_intr_gate(vector, interrupt[irq]);

	}

		irq_desc[idx].handler = &ioapic_edge_type;

	set_intr_gate(vector, interrupt[idx]);

}



static void __init setup_IO_APIC_irqs(void)

arch/x86_64/kernel/io_apic.c

+8 −15
Original line number Diff line number Diff line
@@ -876,21 +876,14 @@ static struct hw_interrupt_type ioapic_edge_type; 


static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)

{

	if (use_pci_vector() && !platform_legacy_irq(irq)) {

		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

				trigger == IOAPIC_LEVEL)

			irq_desc[vector].handler = &ioapic_level_type;

		else

			irq_desc[vector].handler = &ioapic_edge_type;

		set_intr_gate(vector, interrupt[vector]);

	} else	{

	unsigned idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;



	if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

			trigger == IOAPIC_LEVEL)

			irq_desc[irq].handler = &ioapic_level_type;

		irq_desc[idx].handler = &ioapic_level_type;

	else

			irq_desc[irq].handler = &ioapic_edge_type;

		set_intr_gate(vector, interrupt[irq]);

	}

		irq_desc[idx].handler = &ioapic_edge_type;

	set_intr_gate(vector, interrupt[idx]);

}



static void __init setup_IO_APIC_irqs(void)