summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-15 14:31:29 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:14 +0200
commitc6b7674f323622d86316bf7951ad9cae1ce24642 (patch)
tree00ff8c061f9c0822c56e46bc59c46dced278f9a9
parent70dd4d992ab324a59cdcd6bedc3f4e729863d514 (diff)
downloadop-kernel-dev-c6b7674f323622d86316bf7951ad9cae1ce24642.zip
op-kernel-dev-c6b7674f323622d86316bf7951ad9cae1ce24642.tar.gz
genirq: use inline function for irq_to_desc
For the non sparse irq case an inline function is perfectly fine. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/linux/irq.h15
-rw-r--r--kernel/irq/handle.c14
2 files changed, 13 insertions, 16 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index dbe8734..7d1adac 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -204,8 +204,6 @@ struct irq_desc {
const char *name;
} ____cacheline_internodealigned_in_smp;
-extern struct irq_desc *irq_to_desc(unsigned int irq);
-extern struct irq_desc *irq_to_desc_alloc(unsigned int irq);
#ifndef CONFIG_HAVE_SPARSE_IRQ
@@ -216,8 +214,21 @@ extern struct irq_desc irq_desc[NR_IRQS];
extern struct irq_desc *irq_desc;
#endif
+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);
+}
+
#else
+extern struct irq_desc *irq_to_desc(unsigned int irq);
+extern struct irq_desc *irq_to_desc_alloc(unsigned int irq);
+
extern struct irq_desc *sparse_irqs;
#define for_each_irq_desc(irqX, desc) \
for (desc = sparse_irqs, irqX = desc->irq; desc; desc = desc->next, irqX = desc ? desc->irq : -1U)
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index fb6bdb6..c19896f 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -262,20 +262,6 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
#endif
-#ifndef CONFIG_HAVE_SPARSE_IRQ
-struct irq_desc *irq_to_desc(unsigned int irq)
-{
- if (irq < nr_irqs)
- return &irq_desc[irq];
-
- return NULL;
-}
-struct irq_desc *irq_to_desc_alloc(unsigned int irq)
-{
- return irq_to_desc(irq);
-}
-#endif
-
/*
* What should we do if we get a hw irq event on an illegal vector?
* Each architecture has to answer this themself.
OpenPOWER on IntegriCloud