aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh/intc/core.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-11 13:03:09 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-10-26 02:01:52 -0400
commitc4318baf00ed24b7fdcc255de33a18ab37ee8606 (patch)
tree2bf80722d2e7236de917e0e577fb14233e58e513 /drivers/sh/intc/core.c
parent2f98492c5375e906e48c78d88351f45bb11b6a8a (diff)
sh: Sanitize sparse irq
Switch over to the new allocator functions. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/intc/core.c')
-rw-r--r--drivers/sh/intc/core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 306ed287077a..8f3c27e9f9e2 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -300,13 +300,13 @@ int __init register_intc_controller(struct intc_desc *desc)
300 for (i = 0; i < hw->nr_vectors; i++) { 300 for (i = 0; i < hw->nr_vectors; i++) {
301 struct intc_vect *vect = hw->vectors + i; 301 struct intc_vect *vect = hw->vectors + i;
302 unsigned int irq = evt2irq(vect->vect); 302 unsigned int irq = evt2irq(vect->vect);
303 struct irq_desc *irq_desc; 303 int res;
304 304
305 if (!vect->enum_id) 305 if (!vect->enum_id)
306 continue; 306 continue;
307 307
308 irq_desc = irq_to_desc_alloc_node(irq, numa_node_id()); 308 res = irq_alloc_desc_at(irq, numa_node_id());
309 if (unlikely(!irq_desc)) { 309 if (res != irq && res != -EEXIST) {
310 pr_err("can't get irq_desc for %d\n", irq); 310 pr_err("can't get irq_desc for %d\n", irq);
311 continue; 311 continue;
312 } 312 }
@@ -326,8 +326,8 @@ int __init register_intc_controller(struct intc_desc *desc)
326 * IRQ support, each vector still needs to have 326 * IRQ support, each vector still needs to have
327 * its own backing irq_desc. 327 * its own backing irq_desc.
328 */ 328 */
329 irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id()); 329 res = irq_alloc_desc_at(irq2, numa_node_id());
330 if (unlikely(!irq_desc)) { 330 if (res != irq2 && res != -EEXIST) {
331 pr_err("can't get irq_desc for %d\n", irq2); 331 pr_err("can't get irq_desc for %d\n", irq2);
332 continue; 332 continue;
333 } 333 }