irq_domain/powerpc: Replace custom xlate functions with library functions

This patch converts a number of the powerpc drivers to use the common library
of irq_domain xlate functions, dropping a bunch of lines in the process.

v5: - Remove tsi108 changes from patch

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>

2 files changed, 2 insertions, 24 deletions

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 46a5f32e958b..92afc382a49e 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -288,21 +288,10 @@ static int pmac_pic_host_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static int pmac_pic_host_xlate(struct irq_domain *h, struct device_node *ct,
-                               const u32 *intspec, unsigned int intsize,
-                               irq_hw_number_t *out_hwirq,
-                               unsigned int *out_flags)
-
-{
-        *out_flags = IRQ_TYPE_NONE;
-        *out_hwirq = *intspec;
-        return 0;
-}
-
 static const struct irq_domain_ops pmac_pic_host_ops = {
         .match = pmac_pic_host_match,
         .map = pmac_pic_host_map,
-        .xlate = pmac_pic_host_xlate,
+        .xlate = irq_domain_xlate_onecell,
 };
 
 static void __init pmac_pic_probe_oldstyle(void)
diff --git a/arch/powerpc/platforms/wsp/opb_pic.c b/arch/powerpc/platforms/wsp/opb_pic.c
index 0c6fe0b50137..cb565bf93650 100644
--- a/arch/powerpc/platforms/wsp/opb_pic.c
+++ b/arch/powerpc/platforms/wsp/opb_pic.c
@@ -196,20 +196,9 @@ static int opb_host_map(struct irq_domain *host, unsigned int virq,
         return 0;
 }
 
-static int opb_host_xlate(struct irq_domain *host, struct device_node *dn,
-                const u32 *intspec, unsigned int intsize,
-                irq_hw_number_t *out_hwirq, unsigned int *out_type)
-{
-        /* Interrupt size must == 2 */
-        BUG_ON(intsize != 2);
-        *out_hwirq = intspec[0];
-        *out_type = intspec[1];
-        return 0;
-}
-
 static const struct irq_domain_ops opb_host_ops = {
         .map = opb_host_map,
-        .xlate = opb_host_xlate,
+        .xlate = irq_domain_xlate_twocell,
 };
 
 irqreturn_t opb_irq_handler(int irq, void *private)