Commit 904d6a30 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes

PCI: x86/visws: use generic INTx swizzle from PCI core

Use the generic pci_common_swizzle() instead of arch-specific code.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent e5582349
...@@ -24,19 +24,6 @@ static void pci_visws_disable_irq(struct pci_dev *dev) { } ...@@ -24,19 +24,6 @@ static void pci_visws_disable_irq(struct pci_dev *dev) { }
unsigned int pci_bus0, pci_bus1; unsigned int pci_bus0, pci_bus1;
static u8 __init visws_swizzle(struct pci_dev *dev, u8 *pinp)
{
u8 pin = *pinp;
while (dev->bus->self) { /* Move up the chain of bridges. */
pin = pci_swizzle_interrupt_pin(dev, pin);
dev = dev->bus->self;
}
*pinp = pin;
return PCI_SLOT(dev->devfn);
}
static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin) static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq, bus = dev->bus->number; int irq, bus = dev->bus->number;
...@@ -101,7 +88,7 @@ int __init pci_visws_init(void) ...@@ -101,7 +88,7 @@ int __init pci_visws_init(void)
raw_pci_ops = &pci_direct_conf1; raw_pci_ops = &pci_direct_conf1;
pci_scan_bus_with_sysdata(pci_bus0); pci_scan_bus_with_sysdata(pci_bus0);
pci_scan_bus_with_sysdata(pci_bus1); pci_scan_bus_with_sysdata(pci_bus1);
pci_fixup_irqs(visws_swizzle, visws_map_irq); pci_fixup_irqs(pci_common_swizzle, visws_map_irq);
pcibios_resource_survey(); pcibios_resource_survey();
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment