summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-15 14:34:09 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:15 +0200
commitee32c9732244bde4b9b59eeac2814c23e2b71f8d (patch)
tree6164d4d8b67a8f870f01d70eefff52ea84a8d22d
parent2cc21ef843d4fb7da122239b644a1f6f0aca60a6 (diff)
downloadlinux-ee32c9732244bde4b9b59eeac2814c23e2b71f8d.tar.gz
linux-ee32c9732244bde4b9b59eeac2814c23e2b71f8d.tar.bz2
linux-ee32c9732244bde4b9b59eeac2814c23e2b71f8d.zip
genirq: remove irq_to_desc_alloc
Remove the leftover of sparseirqs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/io_apic.c6
-rw-r--r--arch/x86/kernel/irqinit_32.c2
-rw-r--r--arch/x86/kernel/irqinit_64.c2
-rw-r--r--include/linux/irq.h5
-rw-r--r--kernel/irq/chip.c2
5 files changed, 4 insertions, 13 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 683610517d2a..e03bc0f87eef 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -1257,11 +1257,7 @@ static void ioapic_register_intr(int irq, unsigned long trigger)
{
struct irq_desc *desc;
- /* first time to use this irq_desc */
- if (irq < 16)
- desc = irq_to_desc(irq);
- else
- desc = irq_to_desc_alloc(irq);
+ desc = irq_to_desc(irq);
if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
trigger == IOAPIC_LEVEL)
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index 9092103a18eb..a8d35998d308 100644
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -70,7 +70,7 @@ void __init init_ISA_irqs (void)
*/
for (i = 0; i < 16; i++) {
/* first time call this irq_desc */
- struct irq_desc *desc = irq_to_desc_alloc(i);
+ struct irq_desc *desc = irq_to_desc(i);
desc->status = IRQ_DISABLED;
desc->action = NULL;
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index d17fbc26d96f..ff0235391285 100644
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -144,7 +144,7 @@ void __init init_ISA_irqs(void)
for (i = 0; i < 16; i++) {
/* first time call this irq_desc */
- struct irq_desc *desc = irq_to_desc_alloc(i);
+ struct irq_desc *desc = irq_to_desc(i);
desc->status = IRQ_DISABLED;
desc->action = NULL;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 68e0f3f9df30..3f33c7790300 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -210,11 +210,6 @@ static inline struct irq_desc *irq_to_desc(unsigned int irq)
return (irq < nr_irqs) ? irq_desc + irq : NULL;
}
-static inline struct irq_desc *irq_to_desc_alloc(unsigned int irq)
-{
- return irq_to_desc(irq);
-}
-
#ifdef CONFIG_HAVE_DYN_ARRAY
#define kstat_irqs_this_cpu(DESC) \
((DESC)->kstat_irqs[smp_processor_id()])
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 570d1ea1db5d..e6f73dbfcc3d 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -28,7 +28,7 @@ void dynamic_irq_init(unsigned int irq)
unsigned long flags;
/* first time to use this irq_desc */
- desc = irq_to_desc_alloc(irq);
+ desc = irq_to_desc(irq);
if (!desc) {
WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
return;