1 files changed, 55 insertions, 61 deletions

diff --git a/include/asm-ppc64/iSeries/HvCallCfg.h b/include/asm-ppc64/iSeries/HvCallCfg.h
index 9f40f16de533..2223a9647d0e 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 */