[PATCH] powerpc: cell: use irq_of_parse_and_map helper

[Rob Herring]

Instead of calling both of_irq_parse_one and irq_create_of_mapping, call
of_irq_parse_and_map instead which does the same thing. This gets us closer
to making the former 2 functions static.

Cc: Arnd Bergmann <a...@arndb.de>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Rob Herring <r...@kernel.org>
---
 arch/powerpc/platforms/cell/spu_manage.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spu_manage.c 
b/arch/powerpc/platforms/cell/spu_manage.c
index f636ee22b203..2e01ad5df492 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -180,35 +180,22 @@ static int __init spu_map_device_old(struct spu *spu)

 static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 {
-       struct of_phandle_args oirq;
-       int ret;
        int i;

        for (i=0; i < 3; i++) {
-               ret = of_irq_parse_one(np, i, &oirq);
-               if (ret) {
-                       pr_debug("spu_new: failed to get irq %d\n", i);
-                       goto err;
-               }
-               ret = -EINVAL;
-               pr_debug("  irq %d no 0x%x on %pOF\n", i, oirq.args[0],
-                        oirq.np);
-               spu->irqs[i] = irq_create_of_mapping(&oirq);
-               if (!spu->irqs[i]) {
-                       pr_debug("spu_new: failed to map it !\n");
+               spu->irqs[i] = irq_of_parse_and_map(np, i);
+               if (!spu->irqs[i])
                        goto err;
-               }
        }
        return 0;

 err:
-       pr_debug("failed to map irq %x for spu %s\n", *oirq.args,
-               spu->name);
+       pr_debug("failed to map irq %x for spu %s\n", i, spu->name);
        for (; i >= 0; i--) {
                if (spu->irqs[i])
                        irq_dispose_mapping(spu->irqs[i]);
        }
-       return ret;
+       return -EINVAL;
 }

 static int spu_map_resource(struct spu *spu, int nr,
--
2.14.1