Commit 30d546da authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: mips: use generic pci_swizzle_interrupt_pin()



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

Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b1c86792
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -146,12 +146,6 @@ int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
	return 0;
}

/* Most MIPS systems have straight-forward swizzling needs.  */
static inline u8 bridge_swizzle(u8 pin, u8 slot)
{
	return (((pin - 1) + slot) % 4) + 1;
}

static inline struct pci_dev *bridge_root_dev(struct pci_dev *dev)
{
	while (dev->bus->parent) {
+1 −8
Original line number Diff line number Diff line
@@ -149,19 +149,12 @@ out:
	       "Skipping PCI bus scan due to resource conflict\n");
}

/* Most MIPS systems have straight-forward swizzling needs.  */

static inline u8 bridge_swizzle(u8 pin, u8 slot)
{
	return (((pin - 1) + slot) % 4) + 1;
}

static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)
{
	u8 pin = *pinp;

	while (dev->bus->parent) {
		pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
		pin = pci_swizzle_interrupt_pin(dev, pin);
		/* Move up the chain of bridges. */
		dev = dev->bus->self;
        }