Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12b955ff authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent f672c392

arch/x86/pci/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -1041,6 +1041,9 @@ static void __init pcibios_fixup_irqs(void) 
	dev = NULL;

	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

		pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);

		if (!pin)

			continue;



#ifdef CONFIG_X86_IO_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) {

			int irq;



			if (!pin)

				continue;



			/*

			 * 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...

		 */

		if (pin && !dev->irq)

		if (!dev->irq)

			pcibios_lookup_irq(dev, 0);

	}

}