genirq: Replace reserve_irqs in core code

We want to get rid of the public interface.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140507154340.061990194@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 6397df2d6945b09ae853c1a75e4d18aa6da7096f..a2b28a2fd7b16d270c45b3c40719a35d0034c58d 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -40,10 +40,9 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip)
        irq_put_desc_unlock(desc, flags);
        /*
         * For !CONFIG_SPARSE_IRQ make the irq show up in
-        * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is
-        * already marked, and this call is harmless.
+        * allocated_irqs.
         */
-       irq_reserve_irq(irq);
+       irq_mark_irq(irq);
        return 0;
 }
 EXPORT_SYMBOL(irq_set_chip);

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index ddf1ffeb79f1e3ac5a5408465d4f31391525de13..c4065e3edbc3403d4c4172ba1a57a35bff7a78b4 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -76,6 +76,12 @@ extern void mask_irq(struct irq_desc *desc);
 extern void unmask_irq(struct irq_desc *desc);
 extern void unmask_threaded_irq(struct irq_desc *desc);
 
+#ifdef CONFIG_SPARSE_IRQ
+static inline void irq_mark_irq(unsigned int irq) { }
+#else
+extern void irq_mark_irq(unsigned int irq);
+#endif
+
 extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
 
 irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action);

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index f388ade5e792af2b37d25f2eef9971bb28d3d4d5..24029348729baef69dc547383cf5d729e3c1c69c 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -299,6 +299,13 @@ static int irq_expand_nr_irqs(unsigned int nr)
        return -ENOMEM;
 }
 
+void irq_mark_irq(unsigned int irq)
+{
+       mutex_lock(&sparse_irq_lock);
+       bitmap_set(allocated_irqs, irq, 1);
+       mutex_unlock(&sparse_irq_lock);
+}
+
 #endif /* !CONFIG_SPARSE_IRQ */
 
 /**