lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: ioapic: Use setup function in __io_apic_setup_irqs()

Browse Source 
Replace the duplicated code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2011-02-23 14:40:35 +01:00
parent e0799c04b2
commit 2d57e37dbf
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/apic/io_apic.c
View File

@@ -1401,8 +1401,8 @@ static bool __init io_apic_pin_not_connected(int idx, int apic_id, int pin)
static void __init __io_apic_setup_irqs(unsigned int apic_id) static void __init __io_apic_setup_irqs(unsigned int apic_id)
{ {
int idx, node = cpu_to_node(0); int idx, node = cpu_to_node(0);
struct io_apic_irq_attr attr;
unsigned int pin, irq; unsigned int pin, irq;
struct irq_cfg *cfg;
for (pin = 0; pin < nr_ioapic_registers[apic_id]; pin++) { for (pin = 0; pin < nr_ioapic_registers[apic_id]; pin++) {
idx = find_irq_entry(apic_id, pin, mp_INT); idx = find_irq_entry(apic_id, pin, mp_INT);
@@ -1419,20 +1419,13 @@ static void __init __io_apic_setup_irqs(unsigned int apic_id)
* installed and if it returns 1: * installed and if it returns 1:
*/ */
if (apic->multi_timer_check && if (apic->multi_timer_check &&
apic->multi_timer_check(apic_id, irq)) apic->multi_timer_check(apic_id, irq))
continue; continue;
cfg = alloc_irq_and_cfg_at(irq, node); set_io_apic_irq_attr(&attr, apic_id, pin, irq_trigger(idx),
if (!cfg) irq_polarity(idx));
continue;
add_pin_to_irq_node(cfg, node, apic_id, pin); io_apic_setup_irq_pin(irq, node, &attr);
/*
* don't mark it in pin_programmed, so later acpi could
* set it correctly when irq < 16
*/
setup_ioapic_irq(apic_id, pin, irq, cfg, irq_trigger(idx),
irq_polarity(idx));
} }
} }