5 files changed, 11 insertions, 26 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index b8d8c914569b..972fa8528a8c 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -140,7 +140,7 @@ static void __init mpc832x_sys_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 4da0698487c0..fbca336aa0ae 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -151,7 +151,7 @@ void __init mpc832x_rdb_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 0b18a75e9200..0f3855c95ff5 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -147,7 +147,7 @@ static void __init mpc836x_mds_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 00f4c3aef78b..57e840a1c027 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -180,7 +180,7 @@ static void __init mpc85xx_mds_pic_init(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 9a2d1edd050e..e1c0fd6dbc1a 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -321,25 +321,9 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)
         return irq_linear_revmap(qe_ic->irqhost, irq);
 }
 
-void qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
-{
-        struct qe_ic *qe_ic = desc->handler_data;
-        unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);
-
-        if (cascade_irq != NO_IRQ)
-                generic_handle_irq(cascade_irq);
-}
-
-void qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc)
-{
-        struct qe_ic *qe_ic = desc->handler_data;
-        unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);
-
-        if (cascade_irq != NO_IRQ)
-                generic_handle_irq(cascade_irq);
-}
-
-void __init qe_ic_init(struct device_node *node, unsigned int flags)
+void __init qe_ic_init(struct device_node *node, unsigned int flags,
+                void (*low_handler)(unsigned int irq, struct irq_desc *desc),
+                void (*high_handler)(unsigned int irq, struct irq_desc *desc))
 {
         struct qe_ic *qe_ic;
         struct resource res;
@@ -399,11 +383,12 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags)
         qe_ic_write(qe_ic->regs, QEIC_CICR, temp);
 
         set_irq_data(qe_ic->virq_low, qe_ic);
-        set_irq_chained_handler(qe_ic->virq_low, qe_ic_cascade_low);
+        set_irq_chained_handler(qe_ic->virq_low, low_handler);
 
-        if (qe_ic->virq_high != NO_IRQ) {
+        if (qe_ic->virq_high != NO_IRQ &&
+                        qe_ic->virq_high != qe_ic->virq_low) {
                 set_irq_data(qe_ic->virq_high, qe_ic);
-                set_irq_chained_handler(qe_ic->virq_high, qe_ic_cascade_high);
+                set_irq_chained_handler(qe_ic->virq_high, high_handler);
         }
 }