Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/pci/visws.c

+1 −14
Original line number Diff line number Diff line
@@ -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;

}