1 files changed, 49 insertions, 56 deletions

diff --git a/arch/ppc64/kernel/XmPciLpEvent.c b/arch/ppc64/kernel/XmPciLpEvent.c
index 809c9bc6678b..3db530744831 100644
--- a/arch/ppc64/kernel/XmPciLpEvent.c
+++ b/arch/ppc64/kernel/XmPciLpEvent.c
@@ -1,9 +1,8 @@
 /*
- * File XmPciLpEvent.h created by Wayne Holm on Mon Jan 15 2001.
+ * File XmPciLpEvent.c created by Wayne Holm on Mon Jan 15 2001.
  *
  * This module handles PCI interrupt events sent by the iSeries Hypervisor.
-*/
-
+ */
 #include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -17,22 +16,22 @@
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iSeries/HvCallPci.h>
-#include <asm/iSeries/XmPciLpEvent.h>
+#include <asm/iSeries/iSeries_irq.h>
 #include <asm/ppcdebug.h>
 
 static long Pci_Interrupt_Count;
 static long Pci_Event_Count;
 
 enum XmPciLpEvent_Subtype {
-        XmPciLpEvent_BusCreated    = 0,         // PHB has been created
-        XmPciLpEvent_BusError      = 1,         // PHB has failed
-        XmPciLpEvent_BusFailed     = 2,         // Msg to Secondary, Primary failed bus
-        XmPciLpEvent_NodeFailed    = 4,         // Multi-adapter bridge has failed
-        XmPciLpEvent_NodeRecovered = 5,         // Multi-adapter bridge has recovered
-        XmPciLpEvent_BusRecovered  = 12,        // PHB has been recovered
-        XmPciLpEvent_UnQuiesceBus  = 18,        // Secondary bus unqiescing
-        XmPciLpEvent_BridgeError   = 21,        // Bridge Error
-        XmPciLpEvent_SlotInterrupt = 22         // Slot interrupt
+        XmPciLpEvent_BusCreated         = 0,    // PHB has been created
+        XmPciLpEvent_BusError           = 1,    // PHB has failed
+        XmPciLpEvent_BusFailed          = 2,    // Msg to Secondary, Primary failed bus
+        XmPciLpEvent_NodeFailed         = 4,    // Multi-adapter bridge has failed
+        XmPciLpEvent_NodeRecovered      = 5,    // Multi-adapter bridge has recovered
+        XmPciLpEvent_BusRecovered       = 12,   // PHB has been recovered
+        XmPciLpEvent_UnQuiesceBus       = 18,   // Secondary bus unqiescing
+        XmPciLpEvent_BridgeError        = 21,   // Bridge Error
+        XmPciLpEvent_SlotInterrupt      = 22    // Slot interrupt
 };
 
 struct XmPciLpEvent_BusInterrupt {
@@ -71,43 +70,6 @@ struct XmPciLpEvent {
 };
 
 static void intReceived(struct XmPciLpEvent *eventParm,
-                struct pt_regs *regsParm);
-
-static void XmPciLpEvent_handler(struct HvLpEvent *eventParm,
-                struct pt_regs *regsParm)
-{
-#ifdef CONFIG_PCI
-#if 0
-        PPCDBG(PPCDBG_BUSWALK, "XmPciLpEvent_handler, type 0x%x\n",
-                        eventParm->xType);
-#endif
-        ++Pci_Event_Count;
-
-        if (eventParm && (eventParm->xType == HvLpEvent_Type_PciIo)) {
-                switch (eventParm->xFlags.xFunction) {
-                case HvLpEvent_Function_Int:
-                        intReceived((struct XmPciLpEvent *)eventParm, regsParm);
-                        break;
-                case HvLpEvent_Function_Ack:
-                        printk(KERN_ERR
-                                "XmPciLpEvent.c: unexpected ack received\n");
-                        break;
-                default:
-                        printk(KERN_ERR
-                                "XmPciLpEvent.c: unexpected event function %d\n",
-                                (int)eventParm->xFlags.xFunction);
-                        break;
-                }
-        } else if (eventParm)
-                printk(KERN_ERR
-                        "XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",
-                        (int)eventParm->xType);
-        else
-                printk(KERN_ERR "XmPciLpEvent.c: NULL event received\n");
-#endif
-}
-
-static void intReceived(struct XmPciLpEvent *eventParm,
                 struct pt_regs *regsParm)
 {
         int irq;
@@ -164,6 +126,39 @@ static void intReceived(struct XmPciLpEvent *eventParm,
         }
 }
 
+static void XmPciLpEvent_handler(struct HvLpEvent *eventParm,
+                struct pt_regs *regsParm)
+{
+#ifdef CONFIG_PCI
+#if 0
+        PPCDBG(PPCDBG_BUSWALK, "XmPciLpEvent_handler, type 0x%x\n",
+                        eventParm->xType);
+#endif
+        ++Pci_Event_Count;
+
+        if (eventParm && (eventParm->xType == HvLpEvent_Type_PciIo)) {
+                switch (eventParm->xFlags.xFunction) {
+                case HvLpEvent_Function_Int:
+                        intReceived((struct XmPciLpEvent *)eventParm, regsParm);
+                        break;
+                case HvLpEvent_Function_Ack:
+                        printk(KERN_ERR
+                                "XmPciLpEvent.c: unexpected ack received\n");
+                        break;
+                default:
+                        printk(KERN_ERR
+                                "XmPciLpEvent.c: unexpected event function %d\n",
+                                (int)eventParm->xFlags.xFunction);
+                        break;
+                }
+        } else if (eventParm)
+                printk(KERN_ERR
+                        "XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",
+                        (int)eventParm->xType);
+        else
+                printk(KERN_ERR "XmPciLpEvent.c: NULL event received\n");
+#endif
+}
 
 /* This should be called sometime prior to buswalk (init_IRQ would be good) */
 int XmPciLpEvent_init()
@@ -179,12 +174,10 @@ int XmPciLpEvent_init()
         if (xRc == 0) {
                 xRc = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);
                 if (xRc != 0)
-                        printk(KERN_ERR
-                                "XmPciLpEvent.c: open event path failed with rc 0x%x\n",
-                                xRc);
+                        printk(KERN_ERR "XmPciLpEvent.c: open event path "
+                                        "failed with rc 0x%x\n", xRc);
         } else
-                printk(KERN_ERR
-                        "XmPciLpEvent.c: register handler failed with rc 0x%x\n",
-                        xRc);
+                printk(KERN_ERR "XmPciLpEvent.c: register handler "
+                                "failed with rc 0x%x\n", xRc);
         return xRc;
 }