Skip to content

Commit

Permalink
PCI: sh: use generic INTx swizzle from PCI core
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Jesse Barnes committed Jan 7, 2009
1 parent 67eed58 commit e558234
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions arch/sh/drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down

0 comments on commit e558234

Please sign in to comment.