diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:52:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:52:53 -0700 |
| commit | 839767e79e7bdf06f241a47701f0f64b8e2d3f61 (patch) | |
| tree | 779e50183bac6bd4b87b6d0d1be0f444bca17428 /kernel | |
| parent | 94df491c4a01b39d81279a68386158eb02656712 (diff) | |
| parent | a2e8461a2ce5e8140b7374eb68af0d09e36e07ff (diff) | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Provide locked setter for chip, handler, name
genirq: Provide a lockdep helper
genirq; Remove the last leftovers of the old sparse irq code
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/irqdesc.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index dbccc799407..6fb014f172f 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -198,15 +198,6 @@ err: return -ENOMEM; } -struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node) -{ - int res = irq_alloc_descs(irq, irq, 1, node); - - if (res == -EEXIST || res == irq) - return irq_to_desc(irq); - return NULL; -} - static int irq_expand_nr_irqs(unsigned int nr) { if (nr > IRQ_BITMAP_BITS) @@ -283,11 +274,6 @@ struct irq_desc *irq_to_desc(unsigned int irq) return (irq < NR_IRQS) ? irq_desc + irq : NULL; } -struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node) -{ - return irq_to_desc(irq); -} - static void free_desc(unsigned int irq) { dynamic_irq_cleanup(irq); |