From 9f8f5b0ee1b63caaa4593bf99ace195d83f1bf46 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 16 Dec 2008 21:37:15 -0700 Subject: [PATCH] --- yaml --- r: 127398 b: refs/heads/master c: e55823492dde22f841ec7deeb4d61f195ecb7ed4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/pci.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index e5966a6cf06d..e31d0960d0d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67eed58060ca2049fd59d35f426b6c7dbd51b20b +refs/heads/master: e55823492dde22f841ec7deeb4d61f195ecb7ed4 diff --git a/trunk/arch/sh/drivers/pci/pci.c b/trunk/arch/sh/drivers/pci/pci.c index aea3b6b3033a..e36c7b870861 100644 --- a/trunk/arch/sh/drivers/pci/pci.c +++ b/trunk/arch/sh/drivers/pci/pci.c @@ -21,21 +21,6 @@ #include #include -static u8 __init simple_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_channel *p; @@ -56,7 +41,7 @@ static int __init pcibios_init(void) busno = bus->subordinate + 1; } - pci_fixup_irqs(simple_swizzle, pcibios_map_platform_irq); + pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq); return 0; }