diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-24 06:24:18 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-12 23:08:36 -0400 |
commit | 123df01e8e046d6065089e1bff29aa3fc48d4420 (patch) | |
tree | 4453d8a9cc4686ca885a4b5f22f9864260d81cd7 /drivers/sh | |
parent | be9c00295b34760ea2f9667929049f094116b5a8 (diff) |
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 <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/intc/virq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index 93cec21e788b..f30ac9354ff2 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c | |||
@@ -219,12 +219,14 @@ restart: | |||
219 | if (radix_tree_deref_retry(entry)) | 219 | if (radix_tree_deref_retry(entry)) |
220 | goto restart; | 220 | goto restart; |
221 | 221 | ||
222 | irq = create_irq(); | 222 | irq = irq_alloc_desc(numa_node_id()); |
223 | if (unlikely(irq < 0)) { | 223 | if (unlikely(irq < 0)) { |
224 | pr_err("no more free IRQs, bailing..\n"); | 224 | pr_err("no more free IRQs, bailing..\n"); |
225 | break; | 225 | break; |
226 | } | 226 | } |
227 | 227 | ||
228 | activate_irq(irq); | ||
229 | |||
228 | pr_info("Setting up a chained VIRQ from %d -> %d\n", | 230 | pr_info("Setting up a chained VIRQ from %d -> %d\n", |
229 | irq, entry->pirq); | 231 | irq, entry->pirq); |
230 | 232 | ||