[PATCH] ppc64 iSeries: obvious code simplifications

This patch does some obvious code cleanups in the iSeries headers files.
	- simplifies the bodies of lots of inline functions
	- parenthesises a macros result
	- removes C++ wrapping
	- adds "extern" to some function declarations
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>

1 files changed, 10 insertions, 25 deletions

diff --git a/include/asm-ppc64/iSeries/HvCallXm.h b/include/asm-ppc64/iSeries/HvCallXm.h
index a99f29b93611..1362a425913f 100644
--- a/include/asm-ppc64/iSeries/HvCallXm.h
+++ b/include/asm-ppc64/iSeries/HvCallXm.h
@@ -19,58 +19,43 @@
 static inline void HvCallXm_getTceTableParms(u64 cb)
 {
         HvCall1(HvCallXmGetTceTableParms, cb);
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
 
 static inline u64 HvCallXm_setTce(u64 tceTableToken, u64 tceOffset, u64 tce)
 {
-        u64 retval = HvCall3(HvCallXmSetTce, tceTableToken, tceOffset, tce );
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retval;
+        return HvCall3(HvCallXmSetTce, tceTableToken, tceOffset, tce);
 }
 
 static inline u64 HvCallXm_setTces(u64 tceTableToken, u64 tceOffset,
                 u64 numTces, u64 tce1, u64 tce2, u64 tce3, u64 tce4)
 {
-        u64 retval = HvCall7(HvCallXmSetTces, tceTableToken, tceOffset, numTces,
-                             tce1, tce2, tce3, tce4 );
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retval;
+        return HvCall7(HvCallXmSetTces, tceTableToken, tceOffset, numTces,
+                             tce1, tce2, tce3, tce4);
 }
 
 static inline u64 HvCallXm_testBus(u16 busNumber)
 {
-        u64 retVal = HvCall1(HvCallXmTestBus, busNumber);
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retVal;
+        return HvCall1(HvCallXmTestBus, busNumber);
 }
 
 static inline u64 HvCallXm_testBusUnit(u16 busNumber, u8 subBusNumber,
                 u8 deviceId)
 {
-        u64 busUnitNumber = (subBusNumber << 8) | deviceId;
-        u64 retVal = HvCall2(HvCallXmTestBusUnit, busNumber, busUnitNumber);
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retVal;
+        return HvCall2(HvCallXmTestBusUnit, busNumber,
+                        (subBusNumber << 8) | deviceId);
 }
 
 static inline u64 HvCallXm_connectBusUnit(u16 busNumber, u8 subBusNumber,
                 u8 deviceId, u64 interruptToken)
 {
-        u64 busUnitNumber = (subBusNumber << 8) | deviceId;
-        u64 queueIndex = 0; // HvLpConfig::mapDsaToQueueIndex(HvLpDSA(busNumber, xBoard, xCard));  
-
-        u64 retVal = HvCall5(HvCallXmConnectBusUnit, busNumber, busUnitNumber,
-                             interruptToken, 0, queueIndex);
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retVal;
+        return HvCall5(HvCallXmConnectBusUnit, busNumber,
+                        (subBusNumber << 8) | deviceId, interruptToken, 0,
+                        0 /* HvLpConfig::mapDsaToQueueIndex(HvLpDSA(busNumber, xBoard, xCard)) */);
 }
 
 static inline u64 HvCallXm_loadTod(void)
 {
-        u64 retVal = HvCall0(HvCallXmLoadTod);
-        // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-        return retVal;
+        return HvCall0(HvCallXmLoadTod);
 }
 
 #endif /* _HVCALLXM_H */