Staging: vt6656: code cleanup, removed OUT definition

Remoted empty OUT define in ttype.h and its usage across the code.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/vt6656/baseband.c

@@ -762,9 +762,9 @@ BBvCaculateParameter (
       UINT cbFrameLength,
       WORD wRate,
       BYTE byPacketType,
-    OUT PWORD pwPhyLen,
-    OUT PBYTE pbyPhySrv,
-    OUT PBYTE pbyPhySgn
+     PWORD pwPhyLen,
+     PBYTE pbyPhySrv,
+     PBYTE pbyPhySgn
     )
 {
     UINT cbBitCount;

drivers/staging/vt6656/baseband.h

@@ -110,9 +110,9 @@ BBvCaculateParameter (
       UINT cbFrameLength,
       WORD wRate,
       BYTE byPacketType,
-    OUT PWORD pwPhyLen,
-    OUT PBYTE pbyPhySrv,
-    OUT PBYTE pbyPhySgn
+     PWORD pwPhyLen,
+     PBYTE pbyPhySrv,
+     PBYTE pbyPhySgn
     );
 
 // timer for antenna diversity

drivers/staging/vt6656/bssdb.c

@@ -772,7 +772,7 @@ BOOL
 BSSbIsSTAInNodeDB(
      HANDLE hDeviceContext,
      PBYTE abyDstAddr,
-    OUT PUINT puNodeIndex
+     PUINT puNodeIndex
     )
 {
     PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -807,7 +807,7 @@ BSSbIsSTAInNodeDB(
 void
 BSSvCreateOneNode(
      HANDLE hDeviceContext,
-    OUT PUINT puNodeIndex
+     PUINT puNodeIndex
     )
 {
 

drivers/staging/vt6656/bssdb.h

@@ -301,13 +301,13 @@ BOOL
 BSSbIsSTAInNodeDB(
      HANDLE hDeviceContext,
      PBYTE abyDstAddr,
-    OUT PUINT puNodeIndex
+     PUINT puNodeIndex
     );
 
 void
 BSSvCreateOneNode(
      HANDLE hDeviceContext,
-    OUT PUINT puNodeIndex
+     PUINT puNodeIndex
     );
 
 void

drivers/staging/vt6656/card.c

@@ -224,8 +224,8 @@ void
 CARDvCaculateOFDMRParameter (
       WORD wRate,
       BYTE byBBType,
-    OUT PBYTE pbyTxRate,
-    OUT PBYTE pbyRsvTime
+     PBYTE pbyTxRate,
+     PBYTE pbyRsvTime
     )
 {
     switch (wRate) {

drivers/staging/vt6656/channel.c

@@ -426,7 +426,7 @@ exit:
 BOOL
 CHvChannelGetList (
       UINT       uCountryCodeIdx,
-    OUT PBYTE      pbyChannelTable
+     PBYTE      pbyChannelTable
     )
 {
     if (uCountryCodeIdx >= CCODE_MAX) {

drivers/staging/vt6656/channel.h

@@ -51,7 +51,7 @@ BYTE    CHbyGetChannelMapping(BYTE byChannelNumber);
 BOOL
 CHvChannelGetList (
       UINT       uCountryCodeIdx,
-    OUT PBYTE      pbyChannelTable
+     PBYTE      pbyChannelTable
     );
 
 #endif  /* _REGULATE_H_ */

drivers/staging/vt6656/datarate.c

@@ -193,11 +193,11 @@ void RATEvParseMaxRate(
      PWLAN_IE_SUPP_RATES pItemRates,
      PWLAN_IE_SUPP_RATES pItemExtRates,
      BOOL bUpdateBasicRate,
-    OUT PWORD pwMaxBasicRate,
-    OUT PWORD pwMaxSuppRate,
-    OUT PWORD pwSuppRate,
-    OUT PBYTE pbyTopCCKRate,
-    OUT PBYTE pbyTopOFDMRate
+     PWORD pwMaxBasicRate,
+     PWORD pwMaxSuppRate,
+     PWORD pwSuppRate,
+     PBYTE pbyTopCCKRate,
+     PBYTE pbyTopOFDMRate
     )
 {
 PSDevice  pDevice = (PSDevice) pDeviceHandler;

drivers/staging/vt6656/datarate.h

@@ -75,11 +75,11 @@ RATEvParseMaxRate(
      PWLAN_IE_SUPP_RATES pItemRates,
      PWLAN_IE_SUPP_RATES pItemExtRates,
      BOOL bUpdateBasicRate,
-    OUT PWORD pwMaxBasicRate,
-    OUT PWORD pwMaxSuppRate,
-    OUT PWORD pwSuppRate,
-    OUT PBYTE pbyTopCCKRate,
-    OUT PBYTE pbyTopOFDMRate
+     PWORD pwMaxBasicRate,
+     PWORD pwMaxSuppRate,
+     PWORD pwSuppRate,
+     PBYTE pbyTopCCKRate,
+     PBYTE pbyTopOFDMRate
     );
 
 void

drivers/staging/vt6656/dpc.c

@@ -80,8 +80,8 @@ static
 void
 s_vGetDASA(
       PBYTE pbyRxBufferAddr,
-    OUT PUINT pcbHeaderSize,
-    OUT PSEthernetHeader psEthHeader
+     PUINT pcbHeaderSize,
+     PSEthernetHeader psEthHeader
     );
 
 static
@@ -92,7 +92,7 @@ s_vProcessRxMACHeader (
       UINT cbPacketSize,
       BOOL bIsWEP,
       BOOL bExtIV,
-    OUT PUINT pcbHeadSize
+     PUINT pcbHeadSize
     );
 
 static BOOL s_bAPModeRxCtl(
@@ -118,11 +118,11 @@ static BOOL s_bHandleRxEncryption(
      PBYTE        pbyFrame,
      UINT         FrameSize,
      PBYTE        pbyRsr,
-    OUT PBYTE       pbyNewRsr,
-    OUT PSKeyItem   *pKeyOut,
+     PBYTE       pbyNewRsr,
+     PSKeyItem   * pKeyOut,
     int *       pbExtIV,
-    OUT PWORD       pwRxTSC15_0,
-    OUT PDWORD      pdwRxTSC47_16
+     PWORD       pwRxTSC15_0,
+     PDWORD      pdwRxTSC47_16
     );
 
 static BOOL s_bHostWepRxEncryption(
@@ -133,10 +133,10 @@ static BOOL s_bHostWepRxEncryption(
      PBYTE        pbyRsr,
      BOOL         bOnFly,
      PSKeyItem    pKey,
-    OUT PBYTE       pbyNewRsr,
+     PBYTE       pbyNewRsr,
     int *       pbExtIV,
-    OUT PWORD       pwRxTSC15_0,
-    OUT PDWORD      pdwRxTSC47_16
+     PWORD       pwRxTSC15_0,
+     PDWORD      pdwRxTSC47_16
 
     );
 
@@ -167,7 +167,7 @@ s_vProcessRxMACHeader (
       UINT cbPacketSize,
       BOOL bIsWEP,
       BOOL bExtIV,
-    OUT PUINT pcbHeadSize
+     PUINT pcbHeadSize
     )
 {
     PBYTE           pbyRxBuffer;
@@ -262,8 +262,8 @@ static
 void
 s_vGetDASA (
       PBYTE pbyRxBufferAddr,
-    OUT PUINT pcbHeaderSize,
-    OUT PSEthernetHeader psEthHeader
+     PUINT pcbHeaderSize,
+     PSEthernetHeader psEthHeader
     )
 {
 	UINT            cbHeaderSize = 0;
@@ -1147,11 +1147,11 @@ static BOOL s_bHandleRxEncryption (
      PBYTE        pbyFrame,
      UINT         FrameSize,
      PBYTE        pbyRsr,
-    OUT PBYTE       pbyNewRsr,
-    OUT PSKeyItem   *pKeyOut,
+     PBYTE       pbyNewRsr,
+     PSKeyItem   * pKeyOut,
     int *       pbExtIV,
-    OUT PWORD       pwRxTSC15_0,
-    OUT PDWORD      pdwRxTSC47_16
+     PWORD       pwRxTSC15_0,
+     PDWORD      pdwRxTSC47_16
     )
 {
     UINT            PayloadLen = FrameSize;
@@ -1295,10 +1295,10 @@ static BOOL s_bHostWepRxEncryption (
      PBYTE        pbyRsr,
      BOOL         bOnFly,
      PSKeyItem    pKey,
-    OUT PBYTE       pbyNewRsr,
+     PBYTE       pbyNewRsr,
     int *       pbExtIV,
-    OUT PWORD       pwRxTSC15_0,
-    OUT PDWORD      pdwRxTSC47_16
+     PWORD       pwRxTSC15_0,
+     PDWORD      pdwRxTSC47_16
     )
 {
     PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

drivers/staging/vt6656/key.c

@@ -164,12 +164,8 @@ void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable)
  * Return Value: TRUE if found otherwise FALSE
  *
  */
-BOOL KeybGetKey (
-      PSKeyManagement pTable,
-      PBYTE           pbyBSSID,
-      DWORD           dwKeyIndex,
-    OUT PSKeyItem       *pKey
-    )
+BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
+		PSKeyItem *pKey)
 {
     int i;
 
@@ -563,12 +559,8 @@ void KeyvRemoveAllWEPKey(
  * Return Value: TRUE if found otherwise FALSE
  *
  */
-BOOL KeybGetTransmitKey (
-      PSKeyManagement pTable,
-      PBYTE           pbyBSSID,
-      DWORD           dwKeyType,
-    OUT PSKeyItem       *pKey
-    )
+BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
+			PSKeyItem *pKey)
 {
     int i, ii;
 
@@ -643,10 +635,7 @@ BOOL KeybGetTransmitKey (
  * Return Value: TRUE if found otherwise FALSE
  *
  */
-BOOL KeybCheckPairewiseKey (
-      PSKeyManagement pTable,
-    OUT PSKeyItem       *pKey
-    )
+BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)
 {
     int i;
 

drivers/staging/vt6656/key.h

@@ -99,12 +99,8 @@ typedef struct tagSKeyManagement
 
 void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable);
 
-BOOL KeybGetKey(
-      PSKeyManagement pTable,
-      PBYTE           pbyBSSID,
-      DWORD           dwKeyIndex,
-    OUT PSKeyItem       *pKey
-    );
+BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
+		PSKeyItem *pKey);
 
 BOOL KeybSetKey(
     void *pDeviceHandler,
@@ -141,17 +137,10 @@ void KeyvRemoveAllWEPKey(
     PSKeyManagement pTable
     );
 
-BOOL KeybGetTransmitKey(
-      PSKeyManagement pTable,
-      PBYTE           pbyBSSID,
-      DWORD           dwKeyType,
-    OUT PSKeyItem       *pKey
-    );
+BOOL KeybGetTransmitKey(PSKeyManagement pTable,	PBYTE pbyBSSID,	DWORD dwKeyType,
+			PSKeyItem *pKey);
 
-BOOL KeybCheckPairewiseKey(
-      PSKeyManagement pTable,
-    OUT PSKeyItem       *pKey
-    );
+BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);
 
 BOOL KeybSetDefaultKey(
     void *pDeviceHandler,

drivers/staging/vt6656/rxtx.c

@@ -187,7 +187,7 @@ s_vFillTxKey(
       PSKeyItem  pTransmitKey,
       PBYTE      pbyHdrBuf,
       WORD       wPayloadLen,
-    OUT PBYTE      pMICHDR
+     PBYTE      pMICHDR
     );
 
 static
@@ -339,7 +339,7 @@ s_vFillTxKey (
       PSKeyItem  pTransmitKey,
       PBYTE      pbyHdrBuf,
       WORD       wPayloadLen,
-    OUT PBYTE      pMICHDR
+     PBYTE      pMICHDR
     )
 {
     PDWORD          pdwIV = (PDWORD) pbyIVHead;
@@ -1439,8 +1439,8 @@ s_bPacketToWirelessUsb(
       PSKeyItem        pTransmitKey,
       UINT             uNodeIndex,
       WORD             wCurrentRate,
-    OUT UINT             *pcbHeaderLen,
-    OUT UINT             *pcbTotalLen
+     UINT             *pcbHeaderLen,
+     UINT             *pcbTotalLen
     )
 {
     PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);

drivers/staging/vt6656/rxtx.h

@@ -678,8 +678,8 @@ bPacketToWirelessUsb(
       PSKeyItem        pTransmitKey,
       UINT             uNodeIndex,
       WORD             wCurrentRate,
-    OUT UINT             *pcbHeaderLen,
-    OUT UINT             *pcbTotalLen
+     UINT             *pcbHeaderLen,
+     UINT             *pcbTotalLen
     );
 
 void vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb);

drivers/staging/vt6656/ttype.h

@@ -33,10 +33,6 @@
 
 /******* Common definitions and typedefs ***********************************/
 
-#ifndef OUT
-#define OUT
-#endif
-
 //2007-0115-05<Add>by MikeLiu
 #ifndef TxInSleep
 #define TxInSleep

drivers/staging/vt6656/usbpipe.c

@@ -229,7 +229,7 @@ PIPEnsControlIn(
      WORD         wValue,
      WORD         wIndex,
      WORD         wLength,
-     OUT  PBYTE   pbyBuffer
+       PBYTE   pbyBuffer
     )
 {
     NTSTATUS            ntStatus = 0;

drivers/staging/vt6656/usbpipe.h

@@ -70,7 +70,7 @@ PIPEnsControlIn(
      WORD         wValue,
      WORD         wIndex,
      WORD         wLength,
-     OUT  PBYTE   pbyBuffer
+       PBYTE   pbyBuffer
     );
 
 

drivers/staging/vt6656/wmgr.c

@@ -312,7 +312,7 @@ s_vMgrSynchBSS (
      PSDevice      pDevice,
      UINT          uBSSMode,
      PKnownBSS     pCurr,
-    OUT PCMD_STATUS  pStatus
+     PCMD_STATUS  pStatus
     );
 
 
@@ -320,8 +320,8 @@ static BOOL
 s_bCipherMatch (
      PKnownBSS                        pBSSNode,
      NDIS_802_11_ENCRYPTION_STATUS    EncStatus,
-    OUT PBYTE                           pbyCCSPK,
-    OUT PBYTE                           pbyCCSGK
+     PBYTE                           pbyCCSPK,
+     PBYTE                           pbyCCSGK
     );
 
  static void  Encyption_Rebuild(
@@ -419,7 +419,7 @@ void
 vMgrAssocBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice             pDevice = (PSDevice)hDeviceContext;
@@ -495,7 +495,7 @@ void
 vMgrReAssocBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice             pDevice = (PSDevice)hDeviceContext;
@@ -576,7 +576,7 @@ vMgrDisassocBeginSta(
       PSMgmtObject pMgmt,
       PBYTE  abyDestAddress,
       WORD    wReason,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice            pDevice = (PSDevice)hDeviceContext;
@@ -1106,7 +1106,7 @@ void
 vMgrAuthenBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject  pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice     pDevice = (PSDevice)hDeviceContext;
@@ -1166,7 +1166,7 @@ vMgrDeAuthenBeginSta(
       PSMgmtObject  pMgmt,
       PBYTE  abyDestAddress,
       WORD    wReason,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice            pDevice = (PSDevice)hDeviceContext;
@@ -2358,7 +2358,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
 void
 vMgrCreateOwnIBSS(
       HANDLE hDeviceContext,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
     PSDevice            pDevice = (PSDevice)hDeviceContext;
@@ -2633,7 +2633,7 @@ vMgrCreateOwnIBSS(
 void
 vMgrJoinBSSBegin(
       HANDLE hDeviceContext,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     )
 {
 
@@ -2967,7 +2967,7 @@ s_vMgrSynchBSS (
      PSDevice      pDevice,
      UINT          uBSSMode,
      PKnownBSS     pCurr,
-    OUT PCMD_STATUS  pStatus
+     PCMD_STATUS  pStatus
     )
 {
     PSMgmtObject  pMgmt = &(pDevice->sMgmtObj);
@@ -4810,8 +4810,8 @@ static BOOL
 s_bCipherMatch (
      PKnownBSS                        pBSSNode,
      NDIS_802_11_ENCRYPTION_STATUS    EncStatus,
-    OUT PBYTE                           pbyCCSPK,
-    OUT PBYTE                           pbyCCSGK
+     PBYTE                           pbyCCSPK,
+     PBYTE                           pbyCCSGK
     )
 {
     BYTE byMulticastCipher = KEY_CTL_INVALID;

drivers/staging/vt6656/wmgr.h

@@ -417,14 +417,14 @@ void
 vMgrAssocBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
 vMgrReAssocBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
@@ -433,26 +433,26 @@ vMgrDisassocBeginSta(
       PSMgmtObject pMgmt,
       PBYTE  abyDestAddress,
       WORD    wReason,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
 vMgrAuthenBeginSta(
       HANDLE hDeviceContext,
       PSMgmtObject pMgmt,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
 vMgrCreateOwnIBSS(
       HANDLE hDeviceContext,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
 vMgrJoinBSSBegin(
       HANDLE hDeviceContext,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 void
@@ -466,7 +466,7 @@ vMgrRxManagePacket(
 void
 vMgrScanBegin(
       HANDLE hDeviceContext,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 */
 
@@ -476,7 +476,7 @@ vMgrDeAuthenBeginSta(
       PSMgmtObject  pMgmt,
       PBYTE   abyDestAddress,
       WORD    wReason,
-    OUT PCMD_STATUS pStatus
+     PCMD_STATUS pStatus
     );
 
 BOOL

drivers/staging/vt6656/wpa2.c

@@ -262,7 +262,7 @@ WPA2vParseRSN (
 -*/
 UINT
 WPA2uSetIEs(void *pMgmtHandle,
-    OUT PWLAN_IE_RSN pRSNIEs
+     PWLAN_IE_RSN pRSNIEs
     )
 {
     PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtHandle;

drivers/staging/vt6656/wpa2.h

@@ -72,7 +72,7 @@ WPA2vParseRSN (
 UINT
 WPA2uSetIEs(
 	void *pMgmtHandle,
-    OUT PWLAN_IE_RSN pRSNIEs
+     PWLAN_IE_RSN pRSNIEs
     );
 
 #endif /* __WPA2_H__ */