diff options
author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-18 15:24:44 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-10-24 11:50:35 +0100 |
commit | f7578496a671a96e501f16a5104893275e32c33a (patch) | |
tree | f1bc2db4847acdea2bb4c777782b29c35c084ae2 /arch/powerpc/platforms/cell/spider-pic.c | |
parent | 3da5278727a895d49a601f67fd49dffa0b80f9a5 (diff) | |
download | blackbird-op-linux-f7578496a671a96e501f16a5104893275e32c33a.tar.gz blackbird-op-linux-f7578496a671a96e501f16a5104893275e32c33a.zip |
of/irq: Use irq_of_parse_and_map()
Replace some instances of of_irq_map_one()/irq_create_of_mapping() and
of_irq_to_resource() by the simpler equivalent irq_of_parse_and_map().
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
[grant.likely: resolved conflicts with core code renames]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/spider-pic.c')
-rw-r--r-- | arch/powerpc/platforms/cell/spider-pic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index d20680446174..1f72f4ab6353 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c @@ -235,9 +235,9 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) /* First, we check whether we have a real "interrupts" in the device * tree in case the device-tree is ever fixed */ - struct of_phandle_args oirq; - if (of_irq_parse_one(pic->host->of_node, 0, &oirq) == 0) - return irq_create_of_mapping(&oirq); + virq = irq_of_parse_and_map(pic->host->of_node, 0); + if (virq) + return virq; /* Now do the horrible hacks */ tmp = of_get_property(pic->host->of_node, "#interrupt-cells", NULL); |