of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.

Several architectures open code effectively the same code block for
finding and mapping PCI irqs. This patch consolidates it down to a
single function.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 2 insertions, 32 deletions

diff --git a/arch/mips/pci/fixup-lantiq.c b/arch/mips/pci/fixup-lantiq.c
index aef60e75003e..c2ce41ea61d7 100644
--- a/arch/mips/pci/fixup-lantiq.c
+++ b/arch/mips/pci/fixup-lantiq.c
@@ -25,15 +25,5 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-        struct of_phandle_args dev_irq;
-        int irq;
-
-        if (of_irq_parse_pci(dev, &dev_irq)) {
-                dev_err(&dev->dev, "trying to map irq for unknown slot:%d pin:%d\n",
-                        slot, pin);
-                return 0;
-        }
-        irq = irq_create_of_mapping(&dev_irq);
-        dev_info(&dev->dev, "SLOT:%d PIN:%d IRQ:%d\n", slot, pin, irq);
-        return irq;
+        return of_irq_parse_and_map_pci(dev, slot, pin);
 }
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index eadc4310cd36..adeff2bfe4cd 100644
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -583,27 +583,7 @@ err_put_intc_node:
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-        struct of_phandle_args dev_irq;
-        int err;
-        int irq;
-
-        err = of_irq_parse_pci(dev, &dev_irq);
-        if (err) {
-                pr_err("pci %s: unable to get irq map, err=%d\n",
-                       pci_name((struct pci_dev *) dev), err);
-                return 0;
-        }
-
-        irq = irq_create_of_mapping(&dev_irq);
-
-        if (irq == 0)
-                pr_crit("pci %s: no irq found for pin %u\n",
-                        pci_name((struct pci_dev *) dev), pin);
-        else
-                pr_info("pci %s: using irq %d for pin %u\n",
-                        pci_name((struct pci_dev *) dev), irq, pin);
-
-        return irq;
+        return of_irq_parse_and_map_pci(dev, slot, pin);
 }
 
 int pcibios_plat_dev_init(struct pci_dev *dev)