Re: [PATCH 10/12] PCI: powerpc: use generic pci_swizzle_interrupt_pin()

Benjamin Herrenschmidt
2008-12-12T20:06:00Z

On Tue, 2008-12-09 at 16:12 -0700, Bjorn Helgaas wrote:
> Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> arch/powerpc/kernel/prom_parse.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
> index a11d689..a377abe 100644
> --- a/arch/powerpc/kernel/prom_parse.c
> +++ b/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;
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html