aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-01-10 19:09:30 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-02-16 08:11:23 -0500
commit6b783f7c5dde2648fa0bbe7fc8ac80d78699e67f (patch)
tree19a92338364d75d365b0587675d19250db5855ee /kernel/irq
parent75294957be1dee7d22dd7d90bd31334ba410e836 (diff)
irq_domain: Remove irq_domain_add_simple()
irq_domain_add_simple() was a stop-gap measure until complete irq_domain support was complete. This patch removes the irq_domain_add_simple() interface. This patch also drops the explicit irq_domain initialization performed by the mach-versatile code because the versatile interrupt controller already has irq_domain support built into it. This was a bug that was hanging around quietly for a while, but with the full irq_domain which actually verifies that irq_domain ranges are available it would cause the registration to fail and the system wouldn't boot. v4: Fixed number of irqs in mx5 gpio code v2: Updated to pass in host_data pointer on irq_domain allocation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Milton Miller <miltonm@bga.com> Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/irqdomain.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 2981ebfeb40c..6328d9350f04 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -722,13 +722,6 @@ struct irq_domain_ops irq_domain_simple_ops = {
722EXPORT_SYMBOL_GPL(irq_domain_simple_ops); 722EXPORT_SYMBOL_GPL(irq_domain_simple_ops);
723 723
724#ifdef CONFIG_OF_IRQ 724#ifdef CONFIG_OF_IRQ
725void irq_domain_add_simple(struct device_node *controller, int irq_base)
726{
727 irq_domain_add_legacy(controller, 32, irq_base, 0,
728 &irq_domain_simple_ops, NULL);
729}
730EXPORT_SYMBOL_GPL(irq_domain_add_simple);
731
732void irq_domain_generate_simple(const struct of_device_id *match, 725void irq_domain_generate_simple(const struct of_device_id *match,
733 u64 phys_base, unsigned int irq_start) 726 u64 phys_base, unsigned int irq_start)
734{ 727{
@@ -737,7 +730,8 @@ void irq_domain_generate_simple(const struct of_device_id *match,
737 (unsigned long long) phys_base, (int) irq_start); 730 (unsigned long long) phys_base, (int) irq_start);
738 node = of_find_matching_node_by_address(NULL, match, phys_base); 731 node = of_find_matching_node_by_address(NULL, match, phys_base);
739 if (node) 732 if (node)
740 irq_domain_add_simple(node, irq_start); 733 irq_domain_add_legacy(node, 32, irq_start, 0,
734 &irq_domain_simple_ops, NULL);
741} 735}
742EXPORT_SYMBOL_GPL(irq_domain_generate_simple); 736EXPORT_SYMBOL_GPL(irq_domain_generate_simple);
743#endif 737#endif