[PATCH v5 21/27] irq_domain/c6x: Use library of xlate functions
From: Grant Likely <hidden>
Date: 2012-02-16 09:11:54
Also in:
linux-arm-kernel, linuxppc-dev, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
The c6x irq controllers don't need to define custom .xlate hooks Signed-off-by: Grant Likely <redacted> Cc: Rob Herring <redacted> Cc: Mark Salter <redacted> Cc: Thomas Gleixner <redacted> --- arch/c6x/kernel/irq.c | 1 + arch/c6x/platforms/megamod-pic.c | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/c6x/kernel/irq.c b/arch/c6x/kernel/irq.c
index c6b36e8..d77bcfd 100644
--- a/arch/c6x/kernel/irq.c
+++ b/arch/c6x/kernel/irq.c@@ -88,6 +88,7 @@ static int core_domain_map(struct irq_domain *h, unsigned int virq, static const struct irq_domain_ops core_domain_ops = { .map = core_domain_map, + .xlate = irq_domain_xlate_onecell, }; void __init init_IRQ(void)
diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c
index 9f35fbf..c1c4e2a 100644
--- a/arch/c6x/platforms/megamod-pic.c
+++ b/arch/c6x/platforms/megamod-pic.c@@ -136,21 +136,9 @@ static int megamod_map(struct irq_domain *h, unsigned int virq, return 0; } -static int megamod_xlate(struct irq_domain *h, struct device_node *ct, - const u32 *intspec, unsigned int intsize, - irq_hw_number_t *out_hwirq, unsigned int *out_type) - -{ - /* megamod intspecs must have 1 cell */ - BUG_ON(intsize != 1); - *out_hwirq = intspec[0]; - *out_type = IRQ_TYPE_NONE; - return 0; -} - static const struct irq_domain_ops megamod_domain_ops = { .map = megamod_map, - .xlate = megamod_xlate, + .xlate = irq_domain_xlate_onecell, }; static void __init set_megamod_mux(struct megamod_pic *pic, int src, int output)
--
1.7.9