From d8d97848fe283741621f48d6d8e5c8671884dd86 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 15 Oct 2008 14:34:09 +0200
Subject: [PATCH] --- yaml --- r: 116543 b: refs/heads/master c:
 ee32c9732244bde4b9b59eeac2814c23e2b71f8d h: refs/heads/master i:   116541:
 8240ed29f033b7bc4e0c0ae5309f151d1df3c62a   116539:
 f555c4c6c79d888516cee6f2c5ce80bdf7c19433   116535:
 9f062024c17fb64f9a38e86607b228362f4e9649   116527:
 361167500b0fc6f6c29dfb76e50f2fd188948c65   116511:
 bfe4751bfaf5fd7da2ae4e6e6de3763e602b4557   116479:
 c8afee4897ef7fa0215b0978ec5d9e9d01b3cef3 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/io_apic.c    | 6 +-----
 trunk/arch/x86/kernel/irqinit_32.c | 2 +-
 trunk/arch/x86/kernel/irqinit_64.c | 2 +-
 trunk/include/linux/irq.h          | 5 -----
 trunk/kernel/irq/chip.c            | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 073f58e46da7..d0c82d98059d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cc21ef843d4fb7da122239b644a1f6f0aca60a6
+refs/heads/master: ee32c9732244bde4b9b59eeac2814c23e2b71f8d
diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c
index 683610517d2a..e03bc0f87eef 100644
--- a/trunk/arch/x86/kernel/io_apic.c
+++ b/trunk/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/trunk/arch/x86/kernel/irqinit_32.c b/trunk/arch/x86/kernel/irqinit_32.c
index 9092103a18eb..a8d35998d308 100644
--- a/trunk/arch/x86/kernel/irqinit_32.c
+++ b/trunk/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/trunk/arch/x86/kernel/irqinit_64.c b/trunk/arch/x86/kernel/irqinit_64.c
index d17fbc26d96f..ff0235391285 100644
--- a/trunk/arch/x86/kernel/irqinit_64.c
+++ b/trunk/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/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 68e0f3f9df30..3f33c7790300 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/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/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 570d1ea1db5d..e6f73dbfcc3d 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/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;