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

Commit 67eed580 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: mips: use generic INTx swizzle from PCI core 



Use the generic pci_common_swizzle() instead of arch-specific code.

Note that pci_common_swizzle() loops based on dev->bus->self, not
dev->bus->parent as the mips common_swizzle() did.  I think they
are equivalent for this purpose.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 06df6993

arch/mips/pci/pci.c

+1 −16
Original line number Diff line number Diff line
@@ -149,21 +149,6 @@ void __devinit register_pci_controller(struct pci_controller *hose) 
	       "Skipping PCI bus scan due to resource conflict\n");

}



static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)

{

	u8 pin = *pinp;



	while (dev->bus->parent) {

		pin = pci_swizzle_interrupt_pin(dev, pin);

		/* Move up the chain of bridges. */

		dev = dev->bus->self;

        }

	*pinp = pin;



	/* The slot is the slot of the last bridge. */

	return PCI_SLOT(dev->devfn);

}



static int __init pcibios_init(void)

{

	struct pci_controller *hose;
@@ -172,7 +157,7 @@ static int __init pcibios_init(void) 
	for (hose = hose_head; hose; hose = hose->next)

		pcibios_scanbus(hose);



	pci_fixup_irqs(common_swizzle, pcibios_map_irq);

	pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq);



	pci_initialized = 1;