From ab6a95968a25b3710cb7de2741b3bfb75a770f44 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 16 Dec 2008 21:37:20 -0700 Subject: [PATCH] --- yaml --- r: 127399 b: refs/heads/master c: 904d6a303361a85bfa4c8181ef62a24edb8da0a8 h: refs/heads/master i: 127397: f356c166200012de819ffcb17055b37e47d35411 127395: c155fc86e6a01ffb7f42f3383ff2aa5c778912ac 127391: 6e92801bb6988ac0dccc50f82c437b40a535daf1 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/visws.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index e31d0960d0d4..1cef113bbc85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e55823492dde22f841ec7deeb4d61f195ecb7ed4 +refs/heads/master: 904d6a303361a85bfa4c8181ef62a24edb8da0a8 diff --git a/trunk/arch/x86/pci/visws.c b/trunk/arch/x86/pci/visws.c index 2c54e7e03f53..bcead7a46871 100644 --- a/trunk/arch/x86/pci/visws.c +++ b/trunk/arch/x86/pci/visws.c @@ -24,19 +24,6 @@ static void pci_visws_disable_irq(struct pci_dev *dev) { } 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) { int irq, bus = dev->bus->number; @@ -101,7 +88,7 @@ int __init pci_visws_init(void) raw_pci_ops = &pci_direct_conf1; pci_scan_bus_with_sysdata(pci_bus0); 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(); return 0; }