genirq: Remove arch_init_chip_data()

This function should have not been there in the first place.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index a0384a4d1e6f4da4d39a02c0f8ba6634842dd236..19988983aeac7dd1970ad2eeae185fa687e7f62b 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -641,11 +641,8 @@ static inline void init_irq_proc(void)
 struct seq_file;
 int show_interrupts(struct seq_file *p, void *v);
 
-struct irq_desc;
-
 extern int early_irq_init(void);
 extern int arch_probe_nr_irqs(void);
 extern int arch_early_irq_init(void);
-extern int arch_init_chip_data(struct irq_desc *desc, int node);
 
 #endif

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index a1fbd1d347afa022482545e9bd9a3c2d3e1fc2f0..6c71f8ea5d7d5d809143f2b7253ec87a0c548d80 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -197,8 +197,6 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node)
                desc = alloc_desc(start + i, node);
                if (!desc)
                        goto err;
-               /* temporary until I fixed x86 madness */
-               arch_init_chip_data(desc, node);
                raw_spin_lock_irqsave(&sparse_irq_lock, flags);
                irq_insert_desc(start + i, desc);
                raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 14a7b80b2cce9bddabf2b1111216e14d3c20e389..d19b1c9aa7c502ed04efae573c3d3da4b284a5b1 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -896,9 +896,4 @@ int __init __weak arch_early_irq_init(void)
 {
        return 0;
 }
-
-int __weak arch_init_chip_data(struct irq_desc *desc, int node)
-{
-       return 0;
-}
 #endif