summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-09-16 14:37:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-09-16 15:43:11 +0200
commit755d119a6204974b2005a98549a48a75a7f5010b (patch)
tree0c2ee8c6758b2331a8c4bae9d908b7c23bc627a3 /include
parent123236ccacc933daac3b39c5eb1f0011c70d41d8 (diff)
downloadlinux-755d119a6204974b2005a98549a48a75a7f5010b.tar.gz
genirq: Simplify irq_data_to_desc()
Avoid the lookup of irq_desc and use the same mechanism for
hierarchical and flat irqdomains.

Based-on-a-patch-from: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/irqdesc.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index dce395cd67de..1fc5304641a1 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -98,11 +98,7 @@ extern struct irq_desc irq_desc[NR_IRQS];
 
 static inline struct irq_desc *irq_data_to_desc(struct irq_data *data)
 {
-#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
-	return irq_to_desc(data->irq);
-#else
-	return container_of(data, struct irq_desc, irq_data);
-#endif
+	return container_of(data->common, struct irq_desc, irq_common_data);
 }
 
 static inline unsigned int irq_desc_get_irq(struct irq_desc *desc)