powerpc/cell: Use irq_of_parse_and_map() helper

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.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 5c409c98cca8a2da3b5e39881319f4c6b7c66de7..e7a04af71452094180984d340b2fe20d74de681e 100644 (file)
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -180,35 +180,22 @@ out:
 
 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,