dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

x86/PCI: minor logic simplications 

Test "pin" immediately to simplify the subsequent code.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: hpa@zytor.com
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2008-12-09 16:11:57 -07:00 committed by Jesse Barnes
parent f672c392b9
commit 12b955ff63
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/pci/irq.c
View File

@ -1041,6 +1041,9 @@ static void __init pcibios_fixup_irqs(void)
dev = NULL; dev = NULL;
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
if (!pin)
continue;
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
/* /*
* Recalculate IRQ numbers if we use the I/O APIC. * Recalculate IRQ numbers if we use the I/O APIC.
@ -1048,9 +1051,6 @@ static void __init pcibios_fixup_irqs(void)
if (io_apic_assign_pci_irqs) { if (io_apic_assign_pci_irqs) {
int irq; int irq;
if (!pin)
continue;
/* /*
* interrupt pins are numbered starting from 1 * interrupt pins are numbered starting from 1
*/ */
@ -1091,7 +1091,7 @@ static void __init pcibios_fixup_irqs(void)
/* /*
* Still no IRQ? Try to lookup one... * Still no IRQ? Try to lookup one...
*/ */
if (pin && !dev->irq) if (!dev->irq)
pcibios_lookup_irq(dev, 0); pcibios_lookup_irq(dev, 0);
} }
} }