MPIC was only used by Power3 which is now unsupported, so remove MPIC
code. XICS is now the only supported interrupt controller for
pSeries so do some cleanups too.

Signed-off-by: Rashmica Gupta <rashm...@gmail.com>
---
 arch/powerpc/platforms/pseries/event_sources.c | 53 +++++++-------------------
 1 file changed, 13 insertions(+), 40 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/event_sources.c 
b/arch/powerpc/platforms/pseries/event_sources.c
index 18380e8f6dfe..a6ddca833119 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -26,48 +26,21 @@ void request_event_sources_irqs(struct device_node *np,
 {
        int i, index, count = 0;
        struct of_phandle_args oirq;
-       const u32 *opicprop;
-       unsigned int opicplen;
        unsigned int virqs[16];
 
-       /* Check for obsolete "open-pic-interrupt" property. If present, then
-        * map those interrupts using the default interrupt host and default
-        * trigger
-        */
-       opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
-       if (opicprop) {
-               opicplen /= sizeof(u32);
-               for (i = 0; i < opicplen; i++) {
-                       if (count > 15)
-                               break;
-                       virqs[count] = irq_create_mapping(NULL, *(opicprop++));
-                       if (virqs[count] == NO_IRQ) {
-                               pr_err("event-sources: Unable to allocate "
-                                      "interrupt number for %s\n",
-                                      np->full_name);
-                               WARN_ON(1);
-                       }
-                       else
-                               count++;
-
-               }
-       }
-       /* Else use normal interrupt tree parsing */
-       else {
-               /* First try to do a proper OF tree parsing */
-               for (index = 0; of_irq_parse_one(np, index, &oirq) == 0;
-                    index++) {
-                       if (count > 15)
-                               break;
-                       virqs[count] = irq_create_of_mapping(&oirq);
-                       if (virqs[count] == NO_IRQ) {
-                               pr_err("event-sources: Unable to allocate "
-                                      "interrupt number for %s\n",
-                                      np->full_name);
-                               WARN_ON(1);
-                       }
-                       else
-                               count++;
+       /* First try to do a proper OF tree parsing */
+       for (index = 0; of_irq_parse_one(np, index, &oirq) == 0;
+            index++) {
+               if (count > 15)
+                       break;
+               virqs[count] = irq_create_of_mapping(&oirq);
+               if (virqs[count] == NO_IRQ) {
+                       pr_err("event-sources: Unable to allocate "
+                              "interrupt number for %s\n",
+                              np->full_name);
+                       WARN_ON(1);
+               } else {
+                       count++;
                }
        }
 
-- 
2.5.0

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to