diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-12-16 21:37:15 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:13:15 -0800 |
| commit | e55823492dde22f841ec7deeb4d61f195ecb7ed4 (patch) | |
| tree | 942cd5b44bed4acb6f64d081418348d2cfd561a7 /arch | |
| parent | 67eed58060ca2049fd59d35f426b6c7dbd51b20b (diff) | |
| download | op-kernel-dev-e55823492dde22f841ec7deeb4d61f195ecb7ed4.zip op-kernel-dev-e55823492dde22f841ec7deeb4d61f195ecb7ed4.tar.gz | |
PCI: sh: 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 sh simple_swizzle() did. I think they
are equivalent for this purpose.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index aea3b6b..e36c7b8 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -21,21 +21,6 @@ #include <linux/init.h> #include <asm/io.h> -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; } |
