Skip to content

Commit 3da5278

Browse files
thierryredingglikely
authored andcommitted
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 <[email protected]> Acked-by: Rob Herring <[email protected]> [grant.likely: fixup s/of_irq_map_one/of_irq_parse_one/] Signed-off-by: Grant Likely <[email protected]>
1 parent a9f10ca commit 3da5278

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/of/irq.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,10 @@ EXPORT_SYMBOL_GPL(of_irq_to_resource);
373373
*/
374374
int of_irq_count(struct device_node *dev)
375375
{
376+
struct of_phandle_args irq;
376377
int nr = 0;
377378

378-
while (of_irq_to_resource(dev, nr, NULL))
379+
while (of_irq_parse_one(dev, nr, &irq) == 0)
379380
nr++;
380381

381382
return nr;

0 commit comments

Comments
 (0)