From c0d139fc2aa6d464186d508f3f8f4d27514af02d Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 9 Dec 2008 16:12:27 -0700 Subject: [PATCH] --- yaml --- r: 127369 b: refs/heads/master c: 3f9455d488ca97f68a1c99c7473c26030261b713 h: refs/heads/master i: 127367: 57ab6d9c5c952371dcd190a5113552ce130a3ab2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_parse.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1bf7b4b63e6f..ce8ea195f1d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aa6e4981741013e4a8c7c3ee7b90c24e89fae24 +refs/heads/master: 3f9455d488ca97f68a1c99c7473c26030261b713 diff --git a/trunk/arch/powerpc/kernel/prom_parse.c b/trunk/arch/powerpc/kernel/prom_parse.c index 8c1335566089..8f0856f312da 100644 --- a/trunk/arch/powerpc/kernel/prom_parse.c +++ b/trunk/arch/powerpc/kernel/prom_parse.c @@ -232,11 +232,6 @@ int of_pci_address_to_resource(struct device_node *dev, int bar, } EXPORT_SYMBOL_GPL(of_pci_address_to_resource); -static u8 of_irq_pci_swizzle(u8 slot, u8 pin) -{ - return (((pin - 1) + slot) % 4) + 1; -} - int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) { struct device_node *dn, *ppnode; @@ -306,7 +301,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) /* We can only get here if we hit a P2P bridge with no node, * let's do standard swizzling and try again */ - lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec); + lspec = pci_swizzle_interrupt_pin(pdev, lspec); pdev = ppdev; }