diff options
| author |   Rob Herring <robh@kernel.org> | 2018-01-04 16:45:41 -0600 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2018-10-03 15:40:00 +1000 |
| commit | 8c8933eba0c2853ecbd6a9ef7542b9058f8b5e11 (patch) | |
| tree | 24047950922af33657948f45c60cb91e3d9501a6 /arch/powerpc/platforms/cell/spu_manage.c | |
| parent | powerpc/mm:book3s: Enable THP migration support (diff) | |
| download | linux-dev-8c8933eba0c2853ecbd6a9ef7542b9058f8b5e11.tar.xz linux-dev-8c8933eba0c2853ecbd6a9ef7542b9058f8b5e11.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/cell/spu_manage.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c index 5c409c98cca8..e7a04af71452 100644 --- 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, |