diff options
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 1cedf410096e..447186a0eeee 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -1179,8 +1179,7 @@ void mp_unmap_irq(int irq) | |||
1179 | * Find a specific PCI IRQ entry. | 1179 | * Find a specific PCI IRQ entry. |
1180 | * Not an __init, possibly needed by modules | 1180 | * Not an __init, possibly needed by modules |
1181 | */ | 1181 | */ |
1182 | int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, | 1182 | int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) |
1183 | struct io_apic_irq_attr *irq_attr) | ||
1184 | { | 1183 | { |
1185 | int irq, i, best_ioapic = -1, best_idx = -1; | 1184 | int irq, i, best_ioapic = -1, best_idx = -1; |
1186 | 1185 | ||
@@ -1234,14 +1233,8 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, | |||
1234 | return -1; | 1233 | return -1; |
1235 | 1234 | ||
1236 | out: | 1235 | out: |
1237 | irq = pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq, | 1236 | return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq, |
1238 | IOAPIC_MAP_ALLOC); | 1237 | IOAPIC_MAP_ALLOC); |
1239 | if (irq > 0) | ||
1240 | set_io_apic_irq_attr(irq_attr, best_ioapic, | ||
1241 | mp_irqs[best_idx].dstirq, | ||
1242 | irq_trigger(best_idx), | ||
1243 | irq_polarity(best_idx)); | ||
1244 | return irq; | ||
1245 | } | 1238 | } |
1246 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); | 1239 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); |
1247 | 1240 | ||