UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

genirq: remove irq_to_desc_alloc 

Remove the leftover of sparseirqs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2008-10-15 14:34:09 +02:00 committed by Ingo Molnar
parent 2cc21ef843
commit ee32c97322
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/io_apic.c
View File

@ -1257,11 +1257,7 @@ static void ioapic_register_intr(int irq, unsigned long trigger)
{ {
struct irq_desc *desc; struct irq_desc *desc;
/* first time to use this irq_desc */ desc = irq_to_desc(irq);
if (irq < 16)
desc = irq_to_desc(irq);
else
desc = irq_to_desc_alloc(irq);
if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
trigger == IOAPIC_LEVEL) trigger == IOAPIC_LEVEL)

2
arch/x86/kernel/irqinit_32.c
View File

@ -70,7 +70,7 @@ void __init init_ISA_irqs (void)
*/ */
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
/* first time call this irq_desc */ /* 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->status = IRQ_DISABLED;
desc->action = NULL; desc->action = NULL;

2
arch/x86/kernel/irqinit_64.c
View File

@ -144,7 +144,7 @@ void __init init_ISA_irqs(void)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
/* first time call this irq_desc */ /* 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->status = IRQ_DISABLED;
desc->action = NULL; desc->action = NULL;

5
include/linux/irq.h
View File

@ -210,11 +210,6 @@ static inline struct irq_desc *irq_to_desc(unsigned int irq)
return (irq < nr_irqs) ? irq_desc + irq : NULL; 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 #ifdef CONFIG_HAVE_DYN_ARRAY
#define kstat_irqs_this_cpu(DESC) \ #define kstat_irqs_this_cpu(DESC) \
((DESC)->kstat_irqs[smp_processor_id()]) ((DESC)->kstat_irqs[smp_processor_id()])

2
kernel/irq/chip.c
View File

@ -28,7 +28,7 @@ void dynamic_irq_init(unsigned int irq)
unsigned long flags; unsigned long flags;
/* first time to use this irq_desc */ /* first time to use this irq_desc */
desc = irq_to_desc_alloc(irq); desc = irq_to_desc(irq);
if (!desc) { if (!desc) {
WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq); WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
return; return;