lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: powerpc: use generic pci_swizzle_interrupt_pin()

Browse Source 
Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas
2008-12-09 16:12:27 -07:00
committed by Jesse Barnes
parent 6aa6e49817
commit 3f9455d488
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/kernel/prom_parse.c
View File

@ -232,11 +232,6 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
} }
EXPORT_SYMBOL_GPL(of_pci_address_to_resource); 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) int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
{ {
struct device_node *dn, *ppnode; 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, /* We can only get here if we hit a P2P bridge with no node,
* let's do standard swizzling and try again * 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; pdev = ppdev;
} }