sh: intc: Allocate subgroup virq backing desc directly.

This switches to using irq_alloc_desc() directly for subgroup IRQs.
We still need to call activate_irq() on these in order to make them
requestable, at least up until these get moved in to their own irq
domain..

Signed-off-by: Paul Mundt <[email protected]>

diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index 93cec21e788bdb7b4024fa5237b9d7a8801c1333..f30ac9354ff248f316fb96a26d534884faa8bf5d 100644 (file)
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -219,12 +219,14 @@ restart:
                if (radix_tree_deref_retry(entry))
                        goto restart;
 
-               irq = create_irq();
+               irq = irq_alloc_desc(numa_node_id());
                if (unlikely(irq < 0)) {
                        pr_err("no more free IRQs, bailing..\n");
                        break;
                }
 
+               activate_irq(irq);
+
                pr_info("Setting up a chained VIRQ from %d -> %d\n",
                        irq, entry->pirq);