From f356c166200012de819ffcb17055b37e47d35411 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 16 Dec 2008 21:37:10 -0700 Subject: [PATCH] --- yaml --- r: 127397 b: refs/heads/master c: 67eed58060ca2049fd59d35f426b6c7dbd51b20b h: refs/heads/master i: 127395: c155fc86e6a01ffb7f42f3383ff2aa5c778912ac v: v3 --- [refs] | 2 +- trunk/arch/mips/pci/pci.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index bd7f2ef295b1..e5966a6cf06d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06df69932add8108f599ef26fcdf36c4f8125e50 +refs/heads/master: 67eed58060ca2049fd59d35f426b6c7dbd51b20b diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c index fa63dc25125d..b0eb9e75c682 100644 --- a/trunk/arch/mips/pci/pci.c +++ b/trunk/arch/mips/pci/pci.c @@ -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;