[PATCH] ppc64 iSeries: header file white space cleanups

This patch just contains white space and comment cleanups in the iSeries
headers files.  There are no semantic changes.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

12 files changed, 644 insertions, 753 deletions

diff --git a/include/asm-ppc64/iSeries/HvCall.h b/include/asm-ppc64/iSeries/HvCall.h
index d9a2e74e239..c903387e912 100644
--- a/include/asm-ppc64/iSeries/HvCall.h
+++ b/include/asm-ppc64/iSeries/HvCall.h
@@ -1,34 +1,28 @@
 /*
  * HvCall.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-
-//===========================================================================
-//
-//	This file contains the "hypervisor call" interface which is used to
-//	drive the hypervisor from the OS.
-//
-//===========================================================================
+/*
+ * This file contains the "hypervisor call" interface which is used to
+ * drive the hypervisor from the OS.
+ */
 #ifndef _HVCALL_H
 #define _HVCALL_H
 
-//-------------------------------------------------------------------
-// Standard Includes
-//-------------------------------------------------------------------
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/paca.h>
@@ -76,9 +70,9 @@ enum HvCall_VaryOffChunkRc
 */
 
 /* Type of yield for HvCallBaseYieldProcessor */
-#define HvCall_YieldTimed 	0	// Yield until specified time (tb)
-#define HvCall_YieldToActive	1	// Yield until all active procs have run
-#define HvCall_YieldToProc	2	// Yield until the specified processor has run
+#define HvCall_YieldTimed	0	/* Yield until specified time (tb) */
+#define HvCall_YieldToActive	1	/* Yield until all active procs have run */
+#define HvCall_YieldToProc	2	/* Yield until the specified processor has run */
 
 /* interrupt masks for setEnabledInterrupts */
 #define HvCall_MaskIPI		0x00000001
@@ -86,7 +80,7 @@ enum HvCall_VaryOffChunkRc
 #define HvCall_MaskLpProd	0x00000004
 #define HvCall_MaskTimeout	0x00000008
 
-/* Log buffer formats                       */
+/* Log buffer formats */
 #define HvCall_LogBuffer_ASCII          0
 #define HvCall_LogBuffer_EBCDIC         1
 
@@ -95,7 +89,7 @@ enum HvCall_VaryOffChunkRc
 #define HvCallBaseGetHwPatch				HvCallBase +  2
 #define HvCallBaseReIplSpAttn				HvCallBase +  3
 #define HvCallBaseSetASR				HvCallBase +  4
-#define HvCallBaseSetASRAndRfi				HvCallBase +  5 
+#define HvCallBaseSetASRAndRfi				HvCallBase +  5
 #define HvCallBaseSetIMR				HvCallBase +  6
 #define HvCallBaseSendIPI				HvCallBase +  7
 #define HvCallBaseTerminateMachine			HvCallBase +  8
@@ -115,81 +109,75 @@ enum HvCall_VaryOffChunkRc
 #define HvCallBaseGetLogBufferCodePage			HvCallBase + 22
 #define HvCallBaseGetLogBufferFormat			HvCallBase + 23
 #define HvCallBaseGetLogBufferLength			HvCallBase + 24
-#define HvCallBaseReadLogBuffer 			HvCallBase + 25
+#define HvCallBaseReadLogBuffer				HvCallBase + 25
 #define HvCallBaseSetLogBufferFormatAndCodePage		HvCallBase + 26
-#define HvCallBaseWriteLogBuffer               		HvCallBase + 27
+#define HvCallBaseWriteLogBuffer			HvCallBase + 27
 #define HvCallBaseRouter28				HvCallBase + 28
 #define HvCallBaseRouter29				HvCallBase + 29
 #define HvCallBaseRouter30				HvCallBase + 30
-#define HvCallBaseSetDebugBus 				HvCallBase + 31
+#define HvCallBaseSetDebugBus				HvCallBase + 31
 
-#define HvCallCcSetDABR  				HvCallCc + 7
+#define HvCallCcSetDABR					HvCallCc + 7
 
-//=====================================================================================
-static inline void		HvCall_setVirtualDecr(void)
+static inline void HvCall_setVirtualDecr(void)
 {
-	/* Ignore any error return codes - most likely means that the target value for the
-	 * LP has been increased and this vary off would bring us below the new target. */
+	/*
+	 * Ignore any error return codes - most likely means that the
+	 * target value for the LP has been increased and this vary off
+	 * would bring us below the new target.
+	 */
 	HvCall0(HvCallBaseSetVirtualDecr);
 }
-//=====================================================================
-static inline void		HvCall_yieldProcessor(unsigned typeOfYield, u64 yieldParm)
+
+static inline void HvCall_yieldProcessor(unsigned typeOfYield, u64 yieldParm)
 {
-	HvCall2( HvCallBaseYieldProcessor, typeOfYield, yieldParm );
+	HvCall2(HvCallBaseYieldProcessor, typeOfYield, yieldParm);
 }
-//=====================================================================
-static inline void		HvCall_setEnabledInterrupts(u64 enabledInterrupts)
+
+static inline void HvCall_setEnabledInterrupts(u64 enabledInterrupts)
 {
-	HvCall1(HvCallBaseSetEnabledInterrupts,enabledInterrupts);
+	HvCall1(HvCallBaseSetEnabledInterrupts, enabledInterrupts);
 }
 
-//=====================================================================
-static inline void		HvCall_clearLogBuffer(HvLpIndex lpindex)
+static inline void HvCall_clearLogBuffer(HvLpIndex lpindex)
 {
-	HvCall1(HvCallBaseClearLogBuffer,lpindex);
+	HvCall1(HvCallBaseClearLogBuffer, lpindex);
 }
 
-//=====================================================================
-static inline u32  		HvCall_getLogBufferCodePage(HvLpIndex lpindex)
+static inline u32 HvCall_getLogBufferCodePage(HvLpIndex lpindex)
 {
-	u32 retVal = HvCall1(HvCallBaseGetLogBufferCodePage,lpindex);
+	u32 retVal = HvCall1(HvCallBaseGetLogBufferCodePage, lpindex);
 	return retVal;
 }
 
-//=====================================================================
-static inline int  		HvCall_getLogBufferFormat(HvLpIndex lpindex)
+static inline int HvCall_getLogBufferFormat(HvLpIndex lpindex)
 {
-	int retVal = HvCall1(HvCallBaseGetLogBufferFormat,lpindex);
+	int retVal = HvCall1(HvCallBaseGetLogBufferFormat, lpindex);
 	return retVal;
 }
 
-//=====================================================================
-static inline u32  		HvCall_getLogBufferLength(HvLpIndex lpindex)
+static inline u32 HvCall_getLogBufferLength(HvLpIndex lpindex)
 {
-	u32 retVal = HvCall1(HvCallBaseGetLogBufferLength,lpindex);
+	u32 retVal = HvCall1(HvCallBaseGetLogBufferLength, lpindex);
 	return retVal;
 }
 
-//=====================================================================
-static inline void  		HvCall_setLogBufferFormatAndCodepage(int format, u32 codePage)
+static inline void HvCall_setLogBufferFormatAndCodepage(int format, u32 codePage)
 {
-	HvCall2(HvCallBaseSetLogBufferFormatAndCodePage,format, codePage);
+	HvCall2(HvCallBaseSetLogBufferFormatAndCodePage, format, codePage);
 }
 
-//=====================================================================
-int HvCall_readLogBuffer(HvLpIndex lpindex, void *buffer, u64 bufLen);
-void HvCall_writeLogBuffer(const void *buffer, u64 bufLen);
+extern int HvCall_readLogBuffer(HvLpIndex lpindex, void *buffer, u64 bufLen);
+extern void HvCall_writeLogBuffer(const void *buffer, u64 bufLen);
 
-//=====================================================================
-static inline void		HvCall_sendIPI(struct paca_struct * targetPaca)
+static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
 {
-	HvCall1( HvCallBaseSendIPI, targetPaca->paca_index );
+	HvCall1(HvCallBaseSendIPI, targetPaca->paca_index);
 }
 
-//=====================================================================
-static inline void		HvCall_terminateMachineSrc(void)
+static inline void HvCall_terminateMachineSrc(void)
 {
-	HvCall0( HvCallBaseTerminateMachineSrc );
+	HvCall0(HvCallBaseTerminateMachineSrc);
 }
 
 static inline void HvCall_setDABR(unsigned long val)
diff --git a/include/asm-ppc64/iSeries/HvCallCfg.h b/include/asm-ppc64/iSeries/HvCallCfg.h
index 9f40f16de53..2223a9647d0 100644
--- a/include/asm-ppc64/iSeries/HvCallCfg.h
+++ b/include/asm-ppc64/iSeries/HvCallCfg.h
@@ -1,43 +1,32 @@
 /*
  * HvCallCfg.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-
-//=====================================================================================
-//
-//	This file contains the "hypervisor call" interface which is used to
-//	drive the hypervisor from the OS.
-//
-//=====================================================================================
+/*
+ * This file contains the "hypervisor call" interface which is used to
+ * drive the hypervisor from the OS.
+ */
 #ifndef _HVCALLCFG_H
 #define _HVCALLCFG_H
 
-//-------------------------------------------------------------------
-// Standard Includes
-//-------------------------------------------------------------------
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
 
-//-------------------------------------------------------------------------------------
-// Constants
-//-------------------------------------------------------------------------------------
-
-enum HvCallCfg_ReqQual
-{
+enum HvCallCfg_ReqQual {
 	HvCallCfg_Cur	= 0,
 	HvCallCfg_Init	= 1,
 	HvCallCfg_Max	= 2,
@@ -49,7 +38,7 @@ enum HvCallCfg_ReqQual
 #define HvCallCfgGetLpVrmIndex				HvCallCfg +  2
 #define HvCallCfgGetLpMinSupportedPlicVrmIndex		HvCallCfg +  3
 #define HvCallCfgGetLpMinCompatablePlicVrmIndex		HvCallCfg +  4
-#define HvCallCfgGetLpVrmName				HvCallCfg +  5 
+#define HvCallCfgGetLpVrmName				HvCallCfg +  5
 #define HvCallCfgGetSystemPhysicalProcessors		HvCallCfg +  6
 #define HvCallCfgGetPhysicalProcessors			HvCallCfg +  7
 #define HvCallCfgGetSystemMsChunks			HvCallCfg +  8
@@ -76,108 +65,113 @@ enum HvCallCfg_ReqQual
 #define HvCallCfgSetMinRuntimeMsChunks			HvCallCfg + 29
 #define HvCallCfgGetVirtualLanIndexMap			HvCallCfg + 30
 #define HvCallCfgGetLpExecutionMode			HvCallCfg + 31
-#define HvCallCfgGetHostingLpIndex 			HvCallCfg + 32
+#define HvCallCfgGetHostingLpIndex			HvCallCfg + 32
 
-//====================================================================
 static inline HvLpIndex	HvCallCfg_getLps(void)
 {
 	HvLpIndex retVal = HvCall0(HvCallCfgGetLps);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//====================================================================
-static inline int		HvCallCfg_isBusDedicated(u64 busIndex)
+
+static inline int HvCallCfg_isBusDedicated(u64 busIndex)
 {
 	int retVal = HvCall1(HvCallCfgIsBusDedicated,busIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//====================================================================
+
 static inline HvLpIndex	HvCallCfg_getBusOwner(u64 busIndex)
 {
 	HvLpIndex retVal = HvCall1(HvCallCfgGetBusOwner,busIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//====================================================================
-static inline HvLpIndexMap	HvCallCfg_getBusAllocation(u64 busIndex)
+
+static inline HvLpIndexMap HvCallCfg_getBusAllocation(u64 busIndex)
 {
 	HvLpIndexMap retVal = HvCall1(HvCallCfgGetBusAllocation,busIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//====================================================================
-static inline HvLpIndexMap	HvCallCfg_getActiveLpMap(void)
+
+static inline HvLpIndexMap HvCallCfg_getActiveLpMap(void)
 {
 	HvLpIndexMap retVal = HvCall0(HvCallCfgGetActiveLpMap);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//====================================================================
-static inline HvLpVirtualLanIndexMap	HvCallCfg_getVirtualLanIndexMap(HvLpIndex lp)
+
+static inline HvLpVirtualLanIndexMap HvCallCfg_getVirtualLanIndexMap(
+		HvLpIndex lp)
 {
-	// This is a new function in V5R1 so calls to this on older 
-	// hypervisors will return -1
+	/*
+	 * This is a new function in V5R1 so calls to this on older
+	 * hypervisors will return -1
+	 */
 	u64 retVal = HvCall1(HvCallCfgGetVirtualLanIndexMap, lp);
-	if(retVal == -1)
+	if (retVal == -1)
 		retVal = 0;
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getSystemMsChunks(void)
+
+static inline u64 HvCallCfg_getSystemMsChunks(void)
 {
 	u64 retVal = HvCall0(HvCallCfgGetSystemMsChunks);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getMsChunks(HvLpIndex lp,enum HvCallCfg_ReqQual qual)
+
+static inline u64 HvCallCfg_getMsChunks(HvLpIndex lp,
+		enum HvCallCfg_ReqQual qual)
 {
 	u64 retVal = HvCall2(HvCallCfgGetMsChunks,lp,qual);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getMinRuntimeMsChunks(HvLpIndex lp)
+
+static inline u64 HvCallCfg_getMinRuntimeMsChunks(HvLpIndex lp)
 {
-	// NOTE: This function was added in v5r1 so older hypervisors will return a -1 value
-	u64 retVal = HvCall1(HvCallCfgGetMinRuntimeMsChunks,lp);
-	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
-	return retVal;
+	/*
+	 * NOTE: This function was added in v5r1 so older hypervisors
+	 * will return a -1 value
+	 */
+	return HvCall1(HvCallCfgGetMinRuntimeMsChunks, lp);
 }
-//===================================================================
-static inline u64		HvCallCfg_setMinRuntimeMsChunks(u64 chunks)
+
+static inline u64 HvCallCfg_setMinRuntimeMsChunks(u64 chunks)
 {
 	u64 retVal = HvCall1(HvCallCfgSetMinRuntimeMsChunks,chunks);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getSystemPhysicalProcessors(void)
+
+static inline u64 HvCallCfg_getSystemPhysicalProcessors(void)
 {
 	u64 retVal = HvCall0(HvCallCfgGetSystemPhysicalProcessors);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getPhysicalProcessors(HvLpIndex lp,enum HvCallCfg_ReqQual qual)
+
+static inline u64 HvCallCfg_getPhysicalProcessors(HvLpIndex lp,
+		enum HvCallCfg_ReqQual qual)
 {
 	u64 retVal = HvCall2(HvCallCfgGetPhysicalProcessors,lp,qual);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 }
-//===================================================================
-static inline u64		HvCallCfg_getConfiguredBusUnitsForInterruptProc(HvLpIndex lp,
-										u16 hvLogicalProcIndex)
+
+static inline u64 HvCallCfg_getConfiguredBusUnitsForInterruptProc(HvLpIndex lp,
+		u16 hvLogicalProcIndex)
 {
 	u64 retVal = HvCall2(HvCallCfgGetConfiguredBusUnitsForIntProc,lp,hvLogicalProcIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 
 }
-//==================================================================
-static inline HvLpSharedPoolIndex	HvCallCfg_getSharedPoolIndex(HvLpIndex lp)
+
+static inline HvLpSharedPoolIndex HvCallCfg_getSharedPoolIndex(HvLpIndex lp)
 {
 	HvLpSharedPoolIndex retVal =
 		HvCall1(HvCallCfgGetSharedPoolIndex,lp);
@@ -185,29 +179,29 @@ static inline HvLpSharedPoolIndex	HvCallCfg_getSharedPoolIndex(HvLpIndex lp)
 	return retVal;
 
 }
-//==================================================================
-static inline u64	HvCallCfg_getSharedProcUnits(HvLpIndex lp,enum HvCallCfg_ReqQual qual)
+
+static inline u64 HvCallCfg_getSharedProcUnits(HvLpIndex lp,
+		enum HvCallCfg_ReqQual qual)
 {
 	u64 retVal = HvCall2(HvCallCfgGetSharedProcUnits,lp,qual);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 
 }
-//==================================================================
-static inline u64	HvCallCfg_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI)
+
+static inline u64 HvCallCfg_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI)
 {
 	u16 retVal = HvCall1(HvCallCfgGetNumProcsInSharedPool,sPI);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
 
 }
-//==================================================================
+
 static inline HvLpIndex	HvCallCfg_getHostingLpIndex(HvLpIndex lp)
 {
 	u64 retVal = HvCall1(HvCallCfgGetHostingLpIndex,lp);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retVal;
-
 }
 
 #endif /* _HVCALLCFG_H */
diff --git a/include/asm-ppc64/iSeries/HvCallEvent.h b/include/asm-ppc64/iSeries/HvCallEvent.h
index 191ddce0c2c..a5954785512 100644
--- a/include/asm-ppc64/iSeries/HvCallEvent.h
+++ b/include/asm-ppc64/iSeries/HvCallEvent.h
@@ -1,32 +1,28 @@
 /*
  * HvCallEvent.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-
 /*
- *	This file contains the "hypervisor call" interface which is used to
- *	drive the hypervisor from the OS.
+ * This file contains the "hypervisor call" interface which is used to
+ * drive the hypervisor from the OS.
  */
 #ifndef _HVCALLEVENT_H
 #define _HVCALLEVENT_H
 
-/*
- * Standard Includes
- */
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/abs_addr.h>
@@ -71,7 +67,7 @@ typedef u64 HvLpDma_Rc;
 #define HvCallEventCloseLpEventPath			HvCallEvent +  2
 #define HvCallEventDmaBufList				HvCallEvent +  3
 #define HvCallEventDmaSingle				HvCallEvent +  4
-#define HvCallEventDmaToSp				HvCallEvent +  5 
+#define HvCallEventDmaToSp				HvCallEvent +  5
 #define HvCallEventGetOverflowLpEvents			HvCallEvent +  6
 #define HvCallEventGetSourceLpInstanceId		HvCallEvent +  7
 #define HvCallEventGetTargetLpInstanceId		HvCallEvent +  8
@@ -85,13 +81,13 @@ typedef u64 HvLpDma_Rc;
 
 static inline void HvCallEvent_getOverflowLpEvents(u8 queueIndex)
 {
-	HvCall1(HvCallEventGetOverflowLpEvents,queueIndex);
+	HvCall1(HvCallEventGetOverflowLpEvents, queueIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
 
 static inline void HvCallEvent_setInterLpQueueIndex(u8 queueIndex)
 {
-	HvCall1(HvCallEventSetInterLpQueueIndex,queueIndex);
+	HvCall1(HvCallEventSetInterLpQueueIndex, queueIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
 
@@ -138,7 +134,7 @@ static inline HvLpEvent_Rc HvCallEvent_signalLpEventFast(HvLpIndex targetLp,
 {
 	HvLpEvent_Rc retVal;
 
-	// Pack the misc bits into a single Dword to pass to PLIC
+	/* Pack the misc bits into a single Dword to pass to PLIC */
 	union {
 		struct HvCallEvent_PackedParms	parms;
 		u64		dword;
@@ -225,7 +221,7 @@ static inline HvLpDma_Rc HvCallEvent_dmaBufList(HvLpEvent_Type type,
 		u64 localBufList, u64 remoteBufList, u32 transferLength)
 {
 	HvLpDma_Rc retVal;
-	// Pack the misc bits into a single Dword to pass to PLIC
+	/* Pack the misc bits into a single Dword to pass to PLIC */
 	union {
 		struct HvCallEvent_PackedDmaParms	parms;
 		u64		dword;
@@ -257,7 +253,7 @@ static inline HvLpDma_Rc HvCallEvent_dmaSingle(HvLpEvent_Type type,
 		u64 localAddrOrTce, u64 remoteAddrOrTce, u32 transferLength)
 {
 	HvLpDma_Rc retVal;
-	// Pack the misc bits into a single Dword to pass to PLIC
+	/* Pack the misc bits into a single Dword to pass to PLIC */
 	union {
 		struct HvCallEvent_PackedDmaParms	parms;
 		u64		dword;
@@ -280,7 +276,7 @@ static inline HvLpDma_Rc HvCallEvent_dmaSingle(HvLpEvent_Type type,
 	return retVal;
 }
 
-static inline HvLpDma_Rc HvCallEvent_dmaToSp(void* local, u32 remote,
+static inline HvLpDma_Rc HvCallEvent_dmaToSp(void *local, u32 remote,
 		u32 length, HvLpDma_Direction dir)
 {
 	u64 abs_addr;
@@ -293,5 +289,4 @@ static inline HvLpDma_Rc HvCallEvent_dmaToSp(void* local, u32 remote,
 	return retVal;
 }
 
-
 #endif /* _HVCALLEVENT_H */
diff --git a/include/asm-ppc64/iSeries/HvCallHpt.h b/include/asm-ppc64/iSeries/HvCallHpt.h
index da769873d18..827d26c60fc 100644
--- a/include/asm-ppc64/iSeries/HvCallHpt.h
+++ b/include/asm-ppc64/iSeries/HvCallHpt.h
@@ -1,17 +1,17 @@
 /*
  * HvCallHpt.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
@@ -19,21 +19,15 @@
 #ifndef _HVCALLHPT_H
 #define _HVCALLHPT_H
 
-//============================================================================
-//
-//	This file contains the "hypervisor call" interface which is used to
-//	drive the hypervisor from the OS.
-//
-//============================================================================
+/*
+ * This file contains the "hypervisor call" interface which is used to
+ * drive the hypervisor from the OS.
+ */
 
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/mmu.h>
 
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-
 #define HvCallHptGetHptAddress		HvCallHpt +  0
 #define HvCallHptGetHptPages		HvCallHpt +  1
 #define HvCallHptSetPp			HvCallHpt +  5
@@ -47,81 +41,76 @@
 #define HvCallHptInvalidateSetSwBitsGet HvCallHpt + 18
 
 
-//============================================================================
-static inline u64		HvCallHpt_getHptAddress(void)
+static inline u64 HvCallHpt_getHptAddress(void)
 {
 	u64 retval = HvCall0(HvCallHptGetHptAddress);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retval;
 }
-//============================================================================
-static inline u64		HvCallHpt_getHptPages(void)
-{	
+
+static inline u64 HvCallHpt_getHptPages(void)
+{
 	u64 retval = HvCall0(HvCallHptGetHptPages);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retval;
 }
-//=============================================================================
-static inline void		HvCallHpt_setPp(u32 hpteIndex, u8 value)
+
+static inline void HvCallHpt_setPp(u32 hpteIndex, u8 value)
 {
-	HvCall2( HvCallHptSetPp, hpteIndex, value );
+	HvCall2(HvCallHptSetPp, hpteIndex, value);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
-//=============================================================================
-static inline void		HvCallHpt_setSwBits(u32 hpteIndex, u8 bitson, u8 bitsoff )
+
+static inline void HvCallHpt_setSwBits(u32 hpteIndex, u8 bitson, u8 bitsoff)
 {
-	HvCall3( HvCallHptSetSwBits, hpteIndex, bitson, bitsoff );
+	HvCall3(HvCallHptSetSwBits, hpteIndex, bitson, bitsoff);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
-//=============================================================================
-static inline void		HvCallHpt_invalidateNoSyncICache(u32 hpteIndex)
-						
+
+static inline void HvCallHpt_invalidateNoSyncICache(u32 hpteIndex)
 {
-	HvCall1( HvCallHptInvalidateNoSyncICache, hpteIndex );
+	HvCall1(HvCallHptInvalidateNoSyncICache, hpteIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
-//=============================================================================
-static inline u64		HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson, u8 bitsoff )
-						
+
+static inline u64 HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson,
+		u8 bitsoff)
 {
 	u64 compressedStatus;
-	compressedStatus = HvCall4( HvCallHptInvalidateSetSwBitsGet, hpteIndex, bitson, bitsoff, 1 );
-	HvCall1( HvCallHptInvalidateNoSyncICache, hpteIndex );
+
+	compressedStatus = HvCall4(HvCallHptInvalidateSetSwBitsGet,
+			hpteIndex, bitson, bitsoff, 1);
+	HvCall1(HvCallHptInvalidateNoSyncICache, hpteIndex);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return compressedStatus;
 }
-//=============================================================================
-static inline u64		HvCallHpt_findValid( HPTE *hpte, u64 vpn )
+
+static inline u64 HvCallHpt_findValid(HPTE *hpte, u64 vpn)
 {
 	u64 retIndex = HvCall3Ret16( HvCallHptFindValid, hpte, vpn, 0, 0 );
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retIndex;
 }
-//=============================================================================
-static inline u64		HvCallHpt_findNextValid( HPTE *hpte, u32 hpteIndex, u8 bitson, u8 bitsoff )
+
+static inline u64 HvCallHpt_findNextValid(HPTE *hpte, u32 hpteIndex,
+		u8 bitson, u8 bitsoff)
 {
 	u64 retIndex = HvCall3Ret16( HvCallHptFindNextValid, hpte, hpteIndex, bitson, bitsoff );
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 	return retIndex;
 }
-//=============================================================================
-static inline void		HvCallHpt_get( HPTE *hpte, u32 hpteIndex )
+
+static inline void HvCallHpt_get(HPTE *hpte, u32 hpteIndex)
 {
-	HvCall2Ret16( HvCallHptGet, hpte, hpteIndex, 0 );
+	HvCall2Ret16(HvCallHptGet, hpte, hpteIndex, 0);
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
-//============================================================================
-static inline void		HvCallHpt_addValidate( u32 hpteIndex,
-						       u32 hBit,
-						       HPTE *hpte )
-						
+
+static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit, HPTE *hpte)
 {
-	HvCall4( HvCallHptAddValidate, hpteIndex,
-		 hBit, (*((u64 *)hpte)), (*(((u64 *)hpte)+1)) );
+	HvCall4(HvCallHptAddValidate, hpteIndex, hBit, (*((u64 *)hpte)),
+			(*(((u64 *)hpte)+1)));
 	// getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
 
-
-//=============================================================================
-
 #endif /* _HVCALLHPT_H */
diff --git a/include/asm-ppc64/iSeries/HvCallPci.h b/include/asm-ppc64/iSeries/HvCallPci.h
index 6887b619288..346ab5d39dc 100644
--- a/include/asm-ppc64/iSeries/HvCallPci.h
+++ b/include/asm-ppc64/iSeries/HvCallPci.h
@@ -1,26 +1,26 @@
-/************************************************************************/
-/* Provides the Hypervisor PCI calls for iSeries Linux Parition.        */
-/* Copyright (C) 2001  <Wayne G Holm> <IBM Corporation>                 */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License, or    */
-/* (at your option) any later version.                                  */
-/*                                                                      */
-/* This program is distributed in the hope that it will be useful,      */ 
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of       */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        */
-/* GNU General Public License for more details.                         */
-/*                                                                      */
-/* You should have received a copy of the GNU General Public License    */ 
-/* along with this program; if not, write to the:                       */
-/* Free Software Foundation, Inc.,                                      */ 
-/* 59 Temple Place, Suite 330,                                          */ 
-/* Boston, MA  02111-1307  USA                                          */
-/************************************************************************/
-/* Change Activity:                                                     */
-/*   Created, Jan 9, 2001                                               */
-/************************************************************************/
+/*
+ * Provides the Hypervisor PCI calls for iSeries Linux Parition.
+ * Copyright (C) 2001  <Wayne G Holm> <IBM Corporation>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the:
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330,
+ * Boston, MA  02111-1307  USA
+ *
+ * Change Activity:
+ *   Created, Jan 9, 2001
+ */
 
 #ifndef _HVCALLPCI_H
 #define _HVCALLPCI_H
@@ -34,8 +34,8 @@
  */
 struct HvCallPci_DsaAddr {
 	u16		busNumber;		/* PHB index? */
-	u8		subBusNumber; 		/* PCI bus number? */
-	u8		deviceId;     		/* device and function? */
+	u8		subBusNumber;		/* PCI bus number? */
+	u8		deviceId;		/* device and function? */
 	u8		barNumber;
 	u8		reserved[3];
 };
@@ -52,34 +52,37 @@ struct HvCallPci_LoadReturn {
 
 enum HvCallPci_DeviceType {
 	HvCallPci_NodeDevice	= 1,
-	HvCallPci_SpDevice	= 2,	
-	HvCallPci_IopDevice     = 3,	
-	HvCallPci_BridgeDevice	= 4,	
-	HvCallPci_MultiFunctionDevice = 5,	
-	HvCallPci_IoaDevice	= 6	
+	HvCallPci_SpDevice	= 2,
+	HvCallPci_IopDevice     = 3,
+	HvCallPci_BridgeDevice	= 4,
+	HvCallPci_MultiFunctionDevice = 5,
+	HvCallPci_IoaDevice	= 6
 };
 
 
 struct HvCallPci_DeviceInfo {
-	u32	deviceType;		// See DeviceType enum for values
+	u32	deviceType;		/* See DeviceType enum for values */
 };
-    
+
 struct HvCallPci_BusUnitInfo {
-	u32	sizeReturned;		// length of data returned
-	u32	deviceType;		// see DeviceType enum for values
+	u32	sizeReturned;		/* length of data returned */
+	u32	deviceType;		/* see DeviceType enum for values */
 };
 
 struct HvCallPci_BridgeInfo {
-	struct HvCallPci_BusUnitInfo busUnitInfo;  // Generic bus unit info
-	u8		subBusNumber;		// Bus number of secondary bus
-	u8		maxAgents;		// Max idsels on secondary bus
-        u8              maxSubBusNumber;        // Max Sub Bus
-	u8		logicalSlotNumber;	// Logical Slot Number for IOA 
+	struct HvCallPci_BusUnitInfo busUnitInfo;  /* Generic bus unit info */
+	u8		subBusNumber;	/* Bus number of secondary bus */
+	u8		maxAgents;	/* Max idsels on secondary bus */
+        u8              maxSubBusNumber; /* Max Sub Bus */
+	u8		logicalSlotNumber; /* Logical Slot Number for IOA */
 };
-    
 
-//  Maximum BusUnitInfo buffer size.  Provided for clients so they can allocate
-//  a buffer big enough for any type of bus unit.  Increase as needed.
+
+/*
+ * Maximum BusUnitInfo buffer size.  Provided for clients so
+ * they can allocate a buffer big enough for any type of bus
+ * unit.  Increase as needed.
+ */
 enum {HvCallPci_MaxBusUnitInfoSize = 128};
 
 struct HvCallPci_BarParms {
@@ -89,12 +92,12 @@ struct HvCallPci_BarParms {
 	u64		protectStart;
 	u64		protectEnd;
 	u64		relocationOffset;
-	u64		pciAddress;		
+	u64		pciAddress;
 	u64		reserved[3];
-};					
+};
 
 enum HvCallPci_VpdType {
-	HvCallPci_BusVpd		= 1,
+	HvCallPci_BusVpd	= 1,
 	HvCallPci_BusAdapterVpd	= 2
 };
 
@@ -123,15 +126,13 @@ enum HvCallPci_VpdType {
 #define HvCallPciUnmaskInterrupts	HvCallPci + 49
 #define HvCallPciGetBusUnitInfo		HvCallPci + 50
 
-//============================================================================
 static inline u64 HvCallPci_configLoad8(u16 busNumber, u8 subBusNumber,
-					u8 deviceId, u32 offset,
-					u8 *value)
+		u8 deviceId, u32 offset, u8 *value)
 {
 	struct HvCallPci_DsaAddr dsa;
 	struct HvCallPci_LoadReturn retVal;
 
-	*((u64*)&dsa) = 0;				
+	*((u64*)&dsa) = 0;
 
 	dsa.busNumber = busNumber;
 	dsa.subBusNumber = subBusNumber;
@@ -145,15 +146,14 @@ static inline u64 HvCallPci_configLoad8(u16 busNumber, u8 subBusNumber,
 
 	return retVal.rc;
 }
-//============================================================================
+
 static inline u64 HvCallPci_configLoad16(u16 busNumber, u8 subBusNumber,
-					 u8 deviceId, u32 offset,
-					 u16 *value)
+		u8 deviceId, u32 offset, u16 *value)
 {
 	struct Hv