tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

genirq: remove irq_to_desc_alloc

Remove the leftover of sparseirqs.

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

authored by

Thomas Gleixner and committed by
Ingo Molnar ee32c973 2cc21ef8

+4 -13
+1 -5
arch/x86/kernel/io_apic.c
··· 1257 1257 { 1258 1258 struct irq_desc *desc; 1259 1259 1260 - /* first time to use this irq_desc */ 1261 - if (irq < 16) 1262 - desc = irq_to_desc(irq); 1263 - else 1264 - desc = irq_to_desc_alloc(irq); 1260 + desc = irq_to_desc(irq); 1265 1261 1266 1262 if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || 1267 1263 trigger == IOAPIC_LEVEL)
+1 -1
arch/x86/kernel/irqinit_32.c
··· 70 70 */ 71 71 for (i = 0; i < 16; i++) { 72 72 /* first time call this irq_desc */ 73 - struct irq_desc *desc = irq_to_desc_alloc(i); 73 + struct irq_desc *desc = irq_to_desc(i); 74 74 75 75 desc->status = IRQ_DISABLED; 76 76 desc->action = NULL;
+1 -1
arch/x86/kernel/irqinit_64.c
··· 144 144 145 145 for (i = 0; i < 16; i++) { 146 146 /* first time call this irq_desc */ 147 - struct irq_desc *desc = irq_to_desc_alloc(i); 147 + struct irq_desc *desc = irq_to_desc(i); 148 148 149 149 desc->status = IRQ_DISABLED; 150 150 desc->action = NULL;
-5
include/linux/irq.h
··· 210 210 return (irq < nr_irqs) ? irq_desc + irq : NULL; 211 211 } 212 212 213 - static inline struct irq_desc *irq_to_desc_alloc(unsigned int irq) 214 - { 215 - return irq_to_desc(irq); 216 - } 217 - 218 213 #ifdef CONFIG_HAVE_DYN_ARRAY 219 214 #define kstat_irqs_this_cpu(DESC) \ 220 215 ((DESC)->kstat_irqs[smp_processor_id()])
+1 -1
kernel/irq/chip.c
··· 28 28 unsigned long flags; 29 29 30 30 /* first time to use this irq_desc */ 31 - desc = irq_to_desc_alloc(irq); 31 + desc = irq_to_desc(irq); 32 32 if (!desc) { 33 33 WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq); 34 34 return;