i386/x86-64: simplify ioapic_register_intr()
PATCH 1/1 i386/x86-64: simplify ioapic_register_intr()
Simplify (remove duplication of) code in ioapic_register_intr().
Signed-off-by Jan Beulich <[email protected]>
diff -Npru /home/jbeulich/tmp/linux-2.6.17-rc2/arch/i386/kernel/io_apic.c 2.6.17-rc2-x86-ioapic_register_intr-simplify/arch/i386/kernel/io_apic.c
arch/i386/kernel/io_apic.c renamed from home/jbeulich/tmp/linux-2.6.17-rc2/arch/i386/kernel/io_apic.c +8 -15
@@ -1184,21 +1184,14 @@ static struct hw_interrupt_type ioapic_estatic 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 { -if ((trigger ==IOAPIC_AUTO &&IO_APIC_irq_trigger (irq)) || - trigger ==IOAPIC_LEVEL ) - irq_desc[irq].handler = &ioapic_level_type; -else - irq_desc[irq].handler = &ioapic_edge_type; -set_intr_gate (vector, interrupt[irq]); - } +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[idx].handler = &ioapic_level_type; +else + irq_desc[idx].handler = &ioapic_edge_type; +set_intr_gate (vector, interrupt[idx]); }static void __init setup_IO_APIC_irqs (void )
diff -Npru /home/jbeulich/tmp/linux-2.6.17-rc2/arch/x86_64/kernel/io_apic.c 2.6.17-rc2-x86-ioapic_register_intr-simplify/arch/x86_64/kernel/io_apic.c
arch/x86_64/kernel/io_apic.c renamed from home/jbeulich/tmp/linux-2.6.17-rc2/arch/x86_64/kernel/io_apic.c +8 -15
@@ -846,21 +846,14 @@ static struct hw_interrupt_type ioapic_estatic 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 { -if ((trigger ==IOAPIC_AUTO &&IO_APIC_irq_trigger (irq)) || - trigger ==IOAPIC_LEVEL ) - irq_desc[irq].handler = &ioapic_level_type; -else - irq_desc[irq].handler = &ioapic_edge_type; -set_intr_gate (vector, interrupt[irq]); - } +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[idx].handler = &ioapic_level_type; +else + irq_desc[idx].handler = &ioapic_edge_type; +set_intr_gate (vector, interrupt[idx]); }static void __init setup_IO_APIC_irqs (void )
Quoted 1 line · Jan Beulich
Simplify (remove duplication of) code in
ioapic_register_intr().
Applied thanks.
-Andi