irq_domain: Make irq_domain structure match powerpc's irq_host
Part of the series to unify the irq remapping mechanisms in the
kernel. A follow up patch will copy the powerpc implementation into
kernel/irq/irqdomain.c, which will be a lot easier if the structures
are identical.
Where they differ, I've chose to use the powerpc names since there is
a lot more code using those names.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index c47d619..dc19862 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -619,10 +619,10 @@
#endif
#ifdef CONFIG_OF
-static int gic_irq_domain_dt_translate(struct irq_domain *d,
- struct device_node *controller,
- const u32 *intspec, unsigned int intsize,
- unsigned long *out_hwirq, unsigned int *out_type)
+static int gic_irq_domain_xlate(struct irq_domain *d,
+ struct device_node *controller,
+ const u32 *intspec, unsigned int intsize,
+ unsigned long *out_hwirq, unsigned int *out_type)
{
if (d->of_node != controller)
return -EINVAL;
@@ -641,9 +641,9 @@
}
#endif
-const struct irq_domain_ops gic_irq_domain_ops = {
+struct irq_domain_ops gic_irq_domain_ops = {
#ifdef CONFIG_OF
- .dt_translate = gic_irq_domain_dt_translate,
+ .xlate = gic_irq_domain_xlate,
#endif
};
@@ -721,7 +721,7 @@
irq_start);
domain->irq_base = irq_start;
}
- domain->priv = gic;
+ domain->host_data = gic;
domain->ops = &gic_irq_domain_ops;
irq_domain_add(domain);