diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-18 15:24:43 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-10-24 11:50:34 +0100 |
| commit | 3da5278727a895d49a601f67fd49dffa0b80f9a5 (patch) | |
| tree | 7cf2db539bcf5e3338e69bd51762c8ada02437ed | |
| parent | a9f10ca76d784023fc45f01f025b54e9960f4ec1 (diff) | |
| download | linux-stable-3da5278727a895d49a601f67fd49dffa0b80f9a5.tar.gz linux-stable-3da5278727a895d49a601f67fd49dffa0b80f9a5.tar.bz2 linux-stable-3da5278727a895d49a601f67fd49dffa0b80f9a5.zip | |
of/irq: Rework of_irq_count()
The of_irq_to_resource() helper that is used to implement of_irq_count()
tries to resolve interrupts and in fact creates a mapping for resolved
interrupts. That's pretty heavy lifting for something that claims to
just return the number of interrupts requested by a given device node.
Instead, use the more lightweight of_irq_map_one(), which, despite the
name, doesn't create an actual mapping. Perhaps a better name would be
of_irq_translate_one().
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
[grant.likely: fixup s/of_irq_map_one/of_irq_parse_one/]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
| -rw-r--r-- | drivers/of/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index ddea945ec29e..7c4ff122785f 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -373,9 +373,10 @@ EXPORT_SYMBOL_GPL(of_irq_to_resource); */ int of_irq_count(struct device_node *dev) { + struct of_phandle_args irq; int nr = 0; - while (of_irq_to_resource(dev, nr, NULL)) + while (of_irq_parse_one(dev, nr, &irq) == 0) nr++; return nr; |