genirq: remove irq_to_desc_alloc

Remove the leftover of sparseirqs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 683610517d2ab1197992c5238d1e162f7605607e..e03bc0f87eefe8d66cdcf135c571c11dfea4aca7 100644 (file)
--- 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 9092103a18eb16d7c88ab430acbb6208e75800e5..a8d35998d308c76c389fd31254e29646d0847c09 100644 (file)
--- 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 d17fbc26d96ff188c383aad51445ec435c9261f7..ff0235391285a6dc388e1d175f04a6425972d90f 100644 (file)
--- 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 68e0f3f9df3007097e87b8574cda22e6901de2c7..3f33c7790300fa6ecb3ff5bda233411f3a3695a5 100644 (file)
--- 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 570d1ea1db5daee44bff774b3e8cc8a37b717f1b..e6f73dbfcc3deb946e51e13eac194754675b76a2 100644 (file)
--- 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;