aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-12-16 23:37:20 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 14:13:16 -0500
commit904d6a303361a85bfa4c8181ef62a24edb8da0a8 (patch)
tree19450aa39ab0e13766619bfde401201c2cc02f6d /arch/x86/pci
parente55823492dde22f841ec7deeb4d61f195ecb7ed4 (diff)
PCI: x86/visws: use generic INTx swizzle from PCI core
Use the generic pci_common_swizzle() instead of arch-specific code. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/visws.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index 2c54e7e03f53..bcead7a46871 100644
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
@@ -24,19 +24,6 @@ static void pci_visws_disable_irq(struct pci_dev *dev) { }
24 24
25unsigned int pci_bus0, pci_bus1; 25unsigned int pci_bus0, pci_bus1;
26 26
27static u8 __init visws_swizzle(struct pci_dev *dev, u8 *pinp)
28{
29 u8 pin = *pinp;
30
31 while (dev->bus->self) { /* Move up the chain of bridges. */
32 pin = pci_swizzle_interrupt_pin(dev, pin);
33 dev = dev->bus->self;
34 }
35 *pinp = pin;
36
37 return PCI_SLOT(dev->devfn);
38}
39
40static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 27static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
41{ 28{
42 int irq, bus = dev->bus->number; 29 int irq, bus = dev->bus->number;
@@ -101,7 +88,7 @@ int __init pci_visws_init(void)
101 raw_pci_ops = &pci_direct_conf1; 88 raw_pci_ops = &pci_direct_conf1;
102 pci_scan_bus_with_sysdata(pci_bus0); 89 pci_scan_bus_with_sysdata(pci_bus0);
103 pci_scan_bus_with_sysdata(pci_bus1); 90 pci_scan_bus_with_sysdata(pci_bus1);
104 pci_fixup_irqs(visws_swizzle, visws_map_irq); 91 pci_fixup_irqs(pci_common_swizzle, visws_map_irq);
105 pcibios_resource_survey(); 92 pcibios_resource_survey();
106 return 0; 93 return 0;
107} 94}