Staging: vt6655: remove VOID definition and use

Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-07 12:30:19 -07:00 · 2010-05-07 12:30:19 -07:00 · 6b35b7b379
commit 6b35b7b379
parent 512abd006d
44 changed files with 315 additions and 319 deletions
--- a/drivers/staging/vt6655/80211mgr.c
+++ b/drivers/staging/vt6655/80211mgr.c
@ -89,7 +89,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 *
 -*/

-VOID
+void
 vMgrEncodeBeacon(
    IN  PWLAN_FR_BEACON  pFrame
     )
@ -121,7 +121,7 @@ vMgrEncodeBeacon(
 -*/


-VOID
+void
 vMgrDecodeBeacon(
    IN  PWLAN_FR_BEACON  pFrame
    )
@ -242,7 +242,7 @@ vMgrDecodeBeacon(
 -*/


-VOID
+void
 vMgrEncodeIBSSATIM(
    IN  PWLAN_FR_IBSSATIM   pFrame
    )
@ -265,7 +265,7 @@ vMgrEncodeIBSSATIM(
 *
 -*/

-VOID
+void
 vMgrDecodeIBSSATIM(
    IN  PWLAN_FR_IBSSATIM   pFrame
    )
@ -287,7 +287,7 @@ vMgrDecodeIBSSATIM(
 *
 -*/

-VOID
+void
 vMgrEncodeDisassociation(
    IN  PWLAN_FR_DISASSOC  pFrame
    )
@ -315,7 +315,7 @@ vMgrEncodeDisassociation(
 *
 -*/

-VOID
+void
 vMgrDecodeDisassociation(
    IN  PWLAN_FR_DISASSOC  pFrame
    )
@ -341,7 +341,7 @@ vMgrDecodeDisassociation(
 -*/


-VOID
+void
 vMgrEncodeAssocRequest(
    IN  PWLAN_FR_ASSOCREQ  pFrame
    )
@ -368,7 +368,7 @@ vMgrEncodeAssocRequest(
 *
 -*/

-VOID
+void
 vMgrDecodeAssocRequest(
    IN  PWLAN_FR_ASSOCREQ  pFrame
    )
@ -434,7 +434,7 @@ vMgrDecodeAssocRequest(
 *
 -*/

-VOID
+void
 vMgrEncodeAssocResponse(
    IN  PWLAN_FR_ASSOCRESP  pFrame
     )
@ -466,7 +466,7 @@ vMgrEncodeAssocResponse(
 *
 -*/

-VOID
+void
 vMgrDecodeAssocResponse(
    IN PWLAN_FR_ASSOCRESP  pFrame
     )
@ -512,7 +512,7 @@ vMgrDecodeAssocResponse(
 *
 -*/

-VOID
+void
 vMgrEncodeReassocRequest(
    IN  PWLAN_FR_REASSOCREQ  pFrame
     )
@ -544,7 +544,7 @@ vMgrEncodeReassocRequest(
 -*/


-VOID
+void
 vMgrDecodeReassocRequest(
    IN  PWLAN_FR_REASSOCREQ  pFrame
     )
@ -616,7 +616,7 @@ vMgrDecodeReassocRequest(
 -*/


-VOID
+void
 vMgrEncodeProbeRequest(
    IN PWLAN_FR_PROBEREQ  pFrame
     )
@ -637,7 +637,7 @@ vMgrEncodeProbeRequest(
 *
 -*/

-VOID
+void
 vMgrDecodeProbeRequest(
    IN PWLAN_FR_PROBEREQ  pFrame
     )
@ -690,7 +690,7 @@ vMgrDecodeProbeRequest(
 -*/


-VOID
+void
 vMgrEncodeProbeResponse(
    IN PWLAN_FR_PROBERESP  pFrame
    )
@ -724,7 +724,7 @@ vMgrEncodeProbeResponse(
 *
 -*/

-VOID
+void
 vMgrDecodeProbeResponse(
    IN PWLAN_FR_PROBERESP  pFrame
    )
@ -838,7 +838,7 @@ vMgrDecodeProbeResponse(
 *
 -*/

-VOID
+void
 vMgrEncodeAuthen(
    IN  PWLAN_FR_AUTHEN  pFrame
    )
@ -869,7 +869,7 @@ vMgrEncodeAuthen(
 *
 -*/

-VOID
+void
 vMgrDecodeAuthen(
    IN  PWLAN_FR_AUTHEN  pFrame
    )
@ -909,7 +909,7 @@ vMgrDecodeAuthen(
 *
 -*/

-VOID
+void
 vMgrEncodeDeauthen(
    IN  PWLAN_FR_DEAUTHEN  pFrame
    )
@ -936,7 +936,7 @@ vMgrEncodeDeauthen(
 *
 -*/

-VOID
+void
 vMgrDecodeDeauthen(
    IN  PWLAN_FR_DEAUTHEN  pFrame
    )
@ -962,7 +962,7 @@ vMgrDecodeDeauthen(
 *
 -*/

-VOID
+void
 vMgrEncodeReassocResponse(
    IN  PWLAN_FR_REASSOCRESP  pFrame
     )
@ -995,7 +995,7 @@ vMgrEncodeReassocResponse(
 -*/


-VOID
+void
 vMgrDecodeReassocResponse(
    IN  PWLAN_FR_REASSOCRESP  pFrame
     )
--- a/drivers/staging/vt6655/80211mgr.h
+++ b/drivers/staging/vt6655/80211mgr.h
@ -714,112 +714,112 @@ typedef struct tagWLAN_FR_DEAUTHEN {

 /*---------------------  Export Functions  --------------------------*/

-VOID
+void
 vMgrEncodeBeacon(
    IN  PWLAN_FR_BEACON  pFrame
     );

-VOID
+void
 vMgrDecodeBeacon(
    IN  PWLAN_FR_BEACON  pFrame
    );

-VOID
+void
 vMgrEncodeIBSSATIM(
    IN  PWLAN_FR_IBSSATIM   pFrame
    );

-VOID
+void
 vMgrDecodeIBSSATIM(
    IN  PWLAN_FR_IBSSATIM   pFrame
    );

-VOID
+void
 vMgrEncodeDisassociation(
    IN  PWLAN_FR_DISASSOC  pFrame
    );

-VOID
+void
 vMgrDecodeDisassociation(
    IN  PWLAN_FR_DISASSOC  pFrame
    );

-VOID
+void
 vMgrEncodeAssocRequest(
    IN  PWLAN_FR_ASSOCREQ  pFrame
    );

-VOID
+void
 vMgrDecodeAssocRequest(
    IN  PWLAN_FR_ASSOCREQ  pFrame
    );

-VOID
+void
 vMgrEncodeAssocResponse(
    IN  PWLAN_FR_ASSOCRESP  pFrame
    );

-VOID
+void
 vMgrDecodeAssocResponse(
    IN PWLAN_FR_ASSOCRESP  pFrame
    );

-VOID
+void
 vMgrEncodeReassocRequest(
    IN  PWLAN_FR_REASSOCREQ  pFrame
    );

-VOID
+void
 vMgrDecodeReassocRequest(
    IN  PWLAN_FR_REASSOCREQ  pFrame
    );

-VOID
+void
 vMgrEncodeProbeRequest(
    IN PWLAN_FR_PROBEREQ  pFrame
    );

-VOID
+void
 vMgrDecodeProbeRequest(
    IN PWLAN_FR_PROBEREQ  pFrame
    );

-VOID
+void
 vMgrEncodeProbeResponse(
    IN PWLAN_FR_PROBERESP  pFrame
    );

-VOID
+void
 vMgrDecodeProbeResponse(
    IN PWLAN_FR_PROBERESP  pFrame
    );

-VOID
+void
 vMgrEncodeAuthen(
    IN  PWLAN_FR_AUTHEN  pFrame
    );

-VOID
+void
 vMgrDecodeAuthen(
    IN  PWLAN_FR_AUTHEN  pFrame
    );

-VOID
+void
 vMgrEncodeDeauthen(
    IN  PWLAN_FR_DEAUTHEN  pFrame
    );

-VOID
+void
 vMgrDecodeDeauthen(
    IN  PWLAN_FR_DEAUTHEN  pFrame
    );

-VOID
+void
 vMgrEncodeReassocResponse(
    IN  PWLAN_FR_REASSOCRESP  pFrame
    );

-VOID
+void
 vMgrDecodeReassocResponse(
    IN  PWLAN_FR_REASSOCRESP  pFrame
    );
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@ -1723,13 +1723,13 @@ ULONG
 s_ulGetRatio(PSDevice pDevice);

 static
-VOID
+void
 s_vChangeAntenna(
    IN PSDevice pDevice
    );

 static
-VOID
+void
 s_vChangeAntenna (
    IN PSDevice pDevice
    )
@ -1843,7 +1843,7 @@ BBuGetFrameTime (
 * Return Value: none
 *
 */
-VOID
+void
 BBvCaculateParameter (
    IN  PSDevice pDevice,
    IN  UINT cbFrameLength,
@ -2321,7 +2321,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
 * Return Value: none
 *
 */
-VOID BBvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyBBRegs)
+void BBvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyBBRegs)
 {
    int  ii;
    BYTE byBase = 1;
@ -2438,7 +2438,7 @@ void BBvLoopbackOff (PSDevice pDevice)
 * Return Value: none
 *
 */
-VOID
+void
 BBvSetShortSlotTime (PSDevice pDevice)
 {
    BYTE byBBRxConf=0;
@ -2462,7 +2462,7 @@ BBvSetShortSlotTime (PSDevice pDevice)

 }

-VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
+void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
 {
    BYTE byBBRxConf=0;

@ -2494,7 +2494,7 @@ VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
 * Return Value: none
 *
 */
-VOID
+void
 BBvSoftwareReset (DWORD_PTR dwIoBase)
 {
    BBbWriteEmbeded(dwIoBase, 0x50, 0x40);
@ -2515,7 +2515,7 @@ BBvSoftwareReset (DWORD_PTR dwIoBase)
 * Return Value: none
 *
 */
-VOID
+void
 BBvPowerSaveModeON (DWORD_PTR dwIoBase)
 {
    BYTE byOrgData;
@ -2537,7 +2537,7 @@ BBvPowerSaveModeON (DWORD_PTR dwIoBase)
 * Return Value: none
 *
 */
-VOID
+void
 BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
 {
    BYTE byOrgData;
@ -2561,7 +2561,7 @@ BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
 *
 */

-VOID
+void
 BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
 {
    BYTE byBBTxConf;
@ -2603,7 +2603,7 @@ BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
 *
 */

-VOID
+void
 BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
 {
    BYTE byBBRxConf;
@ -2634,14 +2634,14 @@ BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
 * Return Value: none
 *
 */
-VOID
+void
 BBvSetDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
 {
    BBbWriteEmbeded(dwIoBase, 0x0C, 0x17);//CR12
    BBbWriteEmbeded(dwIoBase, 0x0D, 0xB9);//CR13
 }

-VOID
+void
 BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
 {
    BBbWriteEmbeded(dwIoBase, 0x0C, 0x00);//CR12
@ -2759,7 +2759,7 @@ ULONG   ulPacketNum;
 }


-VOID
+void
 BBvClearAntDivSQ3Value (PSDevice pDevice)
 {
    UINT    ii;
@ -2786,7 +2786,7 @@ BBvClearAntDivSQ3Value (PSDevice pDevice)
 *
 */

-VOID
+void
 BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
 {

@ -2876,7 +2876,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
 *
 -*/

-VOID
+void
 TimerSQ3CallBack (
    IN  HANDLE      hDeviceContext
    )
@ -2924,7 +2924,7 @@ TimerSQ3CallBack (
 *
 -*/

-VOID
+void
 TimerState1CallBack (
    IN  HANDLE      hDeviceContext
    )
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@ -126,7 +126,7 @@ BBuGetFrameTime(
    IN WORD wRate
    );

-VOID
+void
 BBvCaculateParameter (
    IN  PSDevice pDevice,
    IN  UINT cbFrameLength,
@ -140,38 +140,38 @@ BBvCaculateParameter (
 BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData);
 BOOL BBbWriteEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData);

-VOID BBvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyBBRegs);
+void BBvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyBBRegs);
 void BBvLoopbackOn(PSDevice pDevice);
 void BBvLoopbackOff(PSDevice pDevice);
 void BBvSetShortSlotTime(PSDevice pDevice);
 BOOL BBbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
 BOOL BBbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
-VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);
+void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);

 // VT3253 Baseband
 BOOL BBbVT3253Init(PSDevice pDevice);
-VOID BBvSoftwareReset(DWORD_PTR dwIoBase);
-VOID BBvPowerSaveModeON(DWORD_PTR dwIoBase);
-VOID BBvPowerSaveModeOFF(DWORD_PTR dwIoBase);
-VOID BBvSetTxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
-VOID BBvSetRxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
-VOID BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
-VOID BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
+void BBvSoftwareReset(DWORD_PTR dwIoBase);
+void BBvPowerSaveModeON(DWORD_PTR dwIoBase);
+void BBvPowerSaveModeOFF(DWORD_PTR dwIoBase);
+void BBvSetTxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
+void BBvSetRxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
+void BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
+void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);

 // timer for antenna diversity

-VOID
+void
 TimerSQ3CallBack (
    IN  HANDLE      hDeviceContext
    );

-VOID
+void
 TimerState1CallBack(
    IN  HANDLE      hDeviceContext
    );

 void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
-VOID
+void
 BBvClearAntDivSQ3Value (PSDevice pDevice);

 #endif // __BASEBAND_H__
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@ -90,18 +90,18 @@ const WORD             awHWRetry1[5][5] = {

 /*---------------------  Static Functions  --------------------------*/

-VOID s_vCheckSensitivity(
+void s_vCheckSensitivity(
    IN HANDLE hDeviceContext
    );

 #ifdef Calcu_LinkQual
-VOID s_uCalculateLinkQual(
+void s_uCalculateLinkQual(
    IN HANDLE hDeviceContext
    );
 #endif


-VOID s_vCheckPreEDThreshold(
+void s_vCheckPreEDThreshold(
    IN HANDLE hDeviceContext
    );
 /*---------------------  Export Variables  --------------------------*/
@ -280,7 +280,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;
 -*/


-VOID
+void
 BSSvClearBSSList(
    IN HANDLE hDeviceContext,
    IN BOOL bKeepCurrBSSID
@ -797,7 +797,7 @@ BSSDBbIsSTAInNodeDB(
 *    None
 *
 -*/
-VOID
+void
 BSSvCreateOneNode(
    IN HANDLE hDeviceContext,
    OUT PUINT puNodeIndex
@ -862,7 +862,7 @@ BSSvCreateOneNode(
 *    None
 *
 -*/
-VOID
+void
 BSSvRemoveOneNode(
    IN HANDLE hDeviceContext,
    IN UINT uNodeIndex
@ -895,7 +895,7 @@ BSSvRemoveOneNode(
 *
 -*/

-VOID
+void
 BSSvUpdateAPNode(
    IN HANDLE hDeviceContext,
    IN PWORD pwCapInfo,
@ -958,7 +958,7 @@ BSSvUpdateAPNode(
 -*/


-VOID
+void
 BSSvAddMulticastNode(
    IN HANDLE hDeviceContext
    )
@ -1011,7 +1011,7 @@ BSSvAddMulticastNode(
 BOOL cc=FALSE;
 UINT status;
 #endif
-VOID
+void
 BSSvSecondCallBack(
    IN  HANDLE hDeviceContext
    )
@ -1388,7 +1388,7 @@ start:



-VOID
+void
 BSSvUpdateNodeTxCounter(
    IN HANDLE      hDeviceContext,
    IN BYTE        byTsr0,
@ -1581,7 +1581,7 @@ BSSvUpdateNodeTxCounter(
 -*/


-VOID
+void
 BSSvClearNodeDBTable(
    IN HANDLE hDeviceContext,
    IN UINT uStartIndex
@ -1610,7 +1610,7 @@ BSSvClearNodeDBTable(
 };


-VOID s_vCheckSensitivity(
+void s_vCheckSensitivity(
    IN HANDLE hDeviceContext
    )
 {
@ -1659,7 +1659,7 @@ VOID s_vCheckSensitivity(
 }


-VOID
+void
 BSSvClearAnyBSSJoinRecord (
    IN HANDLE hDeviceContext
    )
@ -1675,7 +1675,7 @@ BSSvClearAnyBSSJoinRecord (
 }

 #ifdef Calcu_LinkQual
-VOID s_uCalculateLinkQual(
+void s_uCalculateLinkQual(
    IN HANDLE hDeviceContext
    )
 {
@ -1723,7 +1723,7 @@ else
 }
 #endif

-VOID s_vCheckPreEDThreshold(
+void s_vCheckPreEDThreshold(
    IN HANDLE hDeviceContext
    )
 {
--- a/drivers/staging/vt6655/bssdb.h
+++ b/drivers/staging/vt6655/bssdb.h
@ -257,7 +257,7 @@ BSSpAddrIsInBSSList(
    IN PWLAN_IE_SSID pSSID
    );

-VOID
+void
 BSSvClearBSSList(
    IN HANDLE hDeviceContext,
    IN BOOL bKeepCurrBSSID
@ -315,13 +315,13 @@ BSSDBbIsSTAInNodeDB(
    OUT PUINT puNodeIndex
    );

-VOID
+void
 BSSvCreateOneNode(
    IN HANDLE hDeviceContext,
    OUT PUINT puNodeIndex
    );

-VOID
+void
 BSSvUpdateAPNode(
    IN HANDLE hDeviceContext,
    IN PWORD pwCapInfo,
@ -330,13 +330,13 @@ BSSvUpdateAPNode(
    );


-VOID
+void
 BSSvSecondCallBack(
    IN HANDLE hDeviceContext
    );


-VOID
+void
 BSSvUpdateNodeTxCounter(
    IN HANDLE hDeviceContext,
    IN BYTE        byTsr0,
@ -345,25 +345,25 @@ BSSvUpdateNodeTxCounter(
    IN UINT        uFIFOHeaderSize
    );

-VOID
+void
 BSSvRemoveOneNode(
    IN HANDLE hDeviceContext,
    IN UINT uNodeIndex
    );

-VOID
+void
 BSSvAddMulticastNode(
    IN HANDLE hDeviceContext
    );


-VOID
+void
 BSSvClearNodeDBTable(
    IN HANDLE hDeviceContext,
    IN UINT uStartIndex
    );

-VOID
+void
 BSSvClearAnyBSSJoinRecord(
    IN HANDLE hDeviceContext
    );
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@ -423,7 +423,7 @@ SCountryTable ChannelRuleTab[CCODE_MAX+1] =
 /*---------------------  Static Functions  --------------------------*/

 static
-VOID
+void
 s_vCaculateOFDMRParameter(
    IN  BYTE byRate,
    IN  CARD_PHY_TYPE ePHYType,
@ -496,7 +496,7 @@ exit:
 *
 */
 static
-VOID
+void
 s_vCaculateOFDMRParameter (
    IN  BYTE byRate,
    IN  CARD_PHY_TYPE ePHYType,
@ -611,7 +611,7 @@ s_vCaculateOFDMRParameter (
 *
 */
 static
-VOID
+void
 s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, PVOID pvSupportRateIEs, PVOID pvExtSupportRateIEs)
 {
    BYTE  byServ = 0, bySignal = 0; // For CCK
@ -1611,7 +1611,7 @@ CARDpGetCurrentAddress (



-VOID CARDvInitChannelTable (PVOID pDeviceHandler)
+void CARDvInitChannelTable (PVOID pDeviceHandler)
 {
    PSDevice    pDevice = (PSDevice) pDeviceHandler;
    BOOL        bMultiBand = FALSE;
@ -2033,7 +2033,7 @@ CARDbStartQuiet (
 * Return Value: none.
 *
 -*/
-VOID
+void
 CARDvSetCountryInfo (
    IN PVOID            pDeviceHandler,
    IN CARD_PHY_TYPE    ePHYType,
@ -2092,7 +2092,7 @@ CARDvSetCountryInfo (
 * Return Value: none.
 *
 -*/
-VOID
+void
 CARDvSetPowerConstraint (
    IN PVOID            pDeviceHandler,
    IN BYTE             byChannel,
@ -2127,7 +2127,7 @@ CARDvSetPowerConstraint (
 * Return Value: none.
 *
 -*/
-VOID
+void
 CARDvGetPowerCapability (
    IN PVOID            pDeviceHandler,
    OUT PBYTE           pbyMinPower,
@ -2279,7 +2279,7 @@ CARDbChannelGetList (
 }


-VOID
+void
 CARDvSetCountryIE(
    IN PVOID        pDeviceHandler,
    IN PVOID        pIE
@ -2324,7 +2324,7 @@ CARDbGetChannelMapInfo(
 }


-VOID
+void
 CARDvSetChannelMapInfo(
    IN PVOID        pDeviceHandler,
    IN UINT         uChannelIndex,
@ -2340,7 +2340,7 @@ CARDvSetChannelMapInfo(
 }


-VOID
+void
 CARDvClearChannelMapInfo(
    IN PVOID        pDeviceHandler
    )
@ -2420,7 +2420,7 @@ CARDbyAutoChannelSelect(


 //xxx
-VOID
+void
 CARDvSafeResetTx (
    IN PVOID    pDeviceHandler
    )
@ -2476,7 +2476,7 @@ CARDvSafeResetTx (
 * Return Value: none
 *
 -*/
-VOID
+void
 CARDvSafeResetRx (
    IN PVOID    pDeviceHandler
    )
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@ -101,8 +101,8 @@ QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
 QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
 BOOL CARDbSetTxPower(PVOID pDeviceHandler, ULONG ulTxPower);
 BYTE CARDbyGetPktType(PVOID pDeviceHandler);
-VOID CARDvSafeResetTx(PVOID pDeviceHandler);
-VOID CARDvSafeResetRx(PVOID pDeviceHandler);
+void CARDvSafeResetTx(PVOID pDeviceHandler);
+void CARDvSafeResetRx(PVOID pDeviceHandler);

 //xxx
 BOOL CARDbRadioPowerOff(PVOID pDeviceHandler);
@ -145,7 +145,7 @@ CARDpGetCurrentAddress (
    );


-VOID CARDvInitChannelTable(PVOID pDeviceHandler);
+void CARDvInitChannelTable(PVOID pDeviceHandler);
 BYTE CARDbyGetChannelMapping(PVOID pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType);

 BOOL
@ -178,21 +178,21 @@ CARDbStartQuiet (
    IN PVOID            pDeviceHandler
    );

-VOID
+void
 CARDvSetCountryInfo (
    IN PVOID            pDeviceHandler,
    IN CARD_PHY_TYPE    ePHYType,
    IN PVOID            pIE
    );

-VOID
+void
 CARDvSetPowerConstraint (
    IN PVOID            pDeviceHandler,
    IN BYTE             byChannel,
    IN I8               byPower
    );

-VOID
+void
 CARDvGetPowerCapability (
    IN PVOID            pDeviceHandler,
    OUT PBYTE           pbyMinPower,
@ -216,7 +216,7 @@ CARDbChannelGetList (
    OUT PBYTE      pbyChannelTable
    );

-VOID
+void
 CARDvSetCountryIE(
    IN PVOID        pDeviceHandler,
    IN PVOID        pIE
@ -230,14 +230,14 @@ CARDbGetChannelMapInfo(
    OUT PBYTE       pbyMap
    );

-VOID
+void
 CARDvSetChannelMapInfo(
    IN PVOID        pDeviceHandler,
    IN UINT         uChannelIndex,
    IN BYTE         byMap
    );

-VOID
+void
 CARDvClearChannelMapInfo(
    IN PVOID        pDeviceHandler
    );
--- a/drivers/staging/vt6655/datarate.c
+++ b/drivers/staging/vt6655/datarate.c
@ -64,13 +64,13 @@ const BYTE acbyIERate[MAX_RATE] =

 /*---------------------  Static Functions  --------------------------*/

-VOID s_vResetCounter (
+void s_vResetCounter (
    IN PKnownNodeDB psNodeDBTable
    );



-VOID
+void
 s_vResetCounter (
    IN PKnownNodeDB psNodeDBTable
    )
@ -194,7 +194,7 @@ wGetRateIdx(
 * Return Value: none
 *
 -*/
-VOID
+void
 RATEvParseMaxRate (
    IN PVOID pDeviceHandler,
    IN PWLAN_IE_SUPP_RATES pItemRates,
@ -307,7 +307,7 @@ UINT  uRateLen;
 #define AUTORATE_TXCNT_THRESHOLD        20
 #define AUTORATE_INC_THRESHOLD          30

-VOID
+void
 RATEvTxRateFallBack (
    IN PVOID pDeviceHandler,
    IN PKnownNodeDB psNodeDBTable
--- a/drivers/staging/vt6655/datarate.h
+++ b/drivers/staging/vt6655/datarate.h
@ -54,7 +54,7 @@



-VOID
+void
 RATEvParseMaxRate(
    IN PVOID pDeviceHandler,
    IN PWLAN_IE_SUPP_RATES pItemRates,
@ -67,7 +67,7 @@ RATEvParseMaxRate(
    OUT PBYTE pbyTopOFDMRate
    );

-VOID
+void
 RATEvTxRateFallBack(
    IN PVOID pDeviceHandler,
    IN PKnownNodeDB psNodeDBTable
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@ -828,7 +828,7 @@ typedef struct __device_info {
 //PLICE_DEBUG->


- inline  static	VOID   EnQueue (PSDevice pDevice,PSRxMgmtPacket  pRxMgmtPacket)
+ inline  static	void   EnQueue (PSDevice pDevice,PSRxMgmtPacket  pRxMgmtPacket)
 {
 	//printk("Enter EnQueue:tail is %d\n",pDevice->rxManeQueue.tail);
 	if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head)
@ -869,7 +869,7 @@ typedef struct __device_info {
 	}
 }

-VOID	InitRxManagementQueue(PSDevice   pDevice);
+void	InitRxManagementQueue(PSDevice   pDevice);



--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@ -478,7 +478,7 @@ pDevice->bUpdateBBVGA = TRUE;
    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON);
 }

-static VOID s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult)
+static void s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult)
 {
    UINT    ii;
    DWORD   dwDuration = 0;
@ -847,7 +847,7 @@ else  CARDbRadioPowerOn(pDevice);



-static VOID device_init_diversity_timer(PSDevice pDevice) {
+static void device_init_diversity_timer(PSDevice pDevice) {

    init_timer(&pDevice->TimerSQ3Tmax1);
    pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice;
@ -1830,7 +1830,7 @@ static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc) {


 //PLICE_DEBUG ->
-VOID	InitRxManagementQueue(PSDevice  pDevice)
+void	InitRxManagementQueue(PSDevice  pDevice)
 {
 	pDevice->rxManeQueue.packet_num = 0;
 	pDevice->rxManeQueue.head = pDevice->rxManeQueue.tail = 0;
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@ -80,7 +80,7 @@ static BYTE s_byGetRateIdx(IN BYTE byRate);


 static
-VOID
+void
 s_vGetDASA(
    IN  PBYTE pbyRxBufferAddr,
    OUT PUINT pcbHeaderSize,
@ -88,7 +88,7 @@ s_vGetDASA(
    );

 static
-VOID
+void
 s_vProcessRxMACHeader (
    IN  PSDevice pDevice,
    IN  PBYTE pbyRxBufferAddr,
@ -163,7 +163,7 @@ static BOOL s_bHostWepRxEncryption(
 *
 -*/
 static
-VOID
+void
 s_vProcessRxMACHeader (
    IN  PSDevice pDevice,
    IN  PBYTE pbyRxBufferAddr,
@ -262,7 +262,7 @@ static BYTE s_byGetRateIdx (IN BYTE byRate)


 static
-VOID
+void
 s_vGetDASA (
    IN  PBYTE pbyRxBufferAddr,
    OUT PUINT pcbHeaderSize,
@ -314,7 +314,7 @@ s_vGetDASA (

 //PLICE_DEBUG ->

-VOID	MngWorkItem(PVOID Context)
+void	MngWorkItem(PVOID Context)
 {
 	PSRxMgmtPacket			pRxMgmtPacket;
 	PSDevice	pDevice =  (PSDevice) Context;
--- a/drivers/staging/vt6655/dpc.h
+++ b/drivers/staging/vt6655/dpc.h
@ -47,7 +47,7 @@ device_receive_frame (
    IN  PSRxDesc pCurrRD
    );

-VOID	MngWorkItem(PVOID Context);
+void	MngWorkItem(PVOID Context);

 #endif // __RXTX_H__

--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@ -714,7 +714,7 @@ if(wpa_Result.authenticated==TRUE) {
 }

 /*
-VOID
+void
 vConfigWEPKey (
    IN PSDevice pDevice,
    IN DWORD    dwKeyIndex,
--- a/drivers/staging/vt6655/ioctl.h
+++ b/drivers/staging/vt6655/ioctl.h
@ -43,7 +43,7 @@
 int private_ioctl(PSDevice pDevice, struct ifreq *rq);

 /*
-VOID vConfigWEPKey (
+void vConfigWEPKey (
    IN PSDevice pDevice,
    IN DWORD    dwKeyIndex,
    IN PBYTE    pbyKey,
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@ -58,7 +58,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 /*---------------------  Static Variables  --------------------------*/

 /*---------------------  Static Functions  --------------------------*/
-static VOID
+static void
 s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
 {
    int i;
@ -96,7 +96,7 @@ s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
 * Return Value: none
 *
 */
-VOID KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
+void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
 {
    int i;
    int jj;
@ -470,7 +470,7 @@ BOOL KeybRemoveAllKey (
 * Return Value: TRUE if success otherwise FALSE
 *
 */
-VOID KeyvRemoveWEPKey (
+void KeyvRemoveWEPKey (
    PSKeyManagement pTable,
    DWORD           dwKeyIndex,
    DWORD_PTR       dwIoBase
@ -492,7 +492,7 @@ VOID KeyvRemoveWEPKey (
    return;
 }

-VOID KeyvRemoveAllWEPKey (
+void KeyvRemoveAllWEPKey (
    PSKeyManagement pTable,
    DWORD_PTR       dwIoBase
    )
--- a/drivers/staging/vt6655/key.h
+++ b/drivers/staging/vt6655/key.h
@ -101,7 +101,7 @@ typedef struct tagSKeyManagement

 /*---------------------  Export Functions  --------------------------*/

-VOID KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase);
+void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase);

 BOOL KeybGetKey(
    IN  PSKeyManagement pTable,
@ -158,13 +158,13 @@ BOOL KeybRemoveAllKey(
    DWORD_PTR       dwIoBase
    );

-VOID KeyvRemoveWEPKey(
+void KeyvRemoveWEPKey(
    PSKeyManagement pTable,
    DWORD           dwKeyIndex,
    DWORD_PTR       dwIoBase
    );

-VOID KeyvRemoveAllWEPKey(
+void KeyvRemoveAllWEPKey(
    PSKeyManagement pTable,
    DWORD_PTR       dwIoBase
    );
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@ -103,7 +103,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 * Return Value: none
 *
 */
-VOID MACvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyMacRegs)
+void MACvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyMacRegs)
 {
    int ii;

@ -234,7 +234,7 @@ BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx)
 * Return Value: none
 *
 */
-VOID MACvWriteMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData)
+void MACvWriteMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData)
 {
    MACvSelectPage1(dwIoBase);
    VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData);
@ -676,7 +676,7 @@ void MACvSaveContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
 * Return Value: none
 *
 */
-VOID MACvRestoreContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
+void MACvRestoreContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
 {
    int         ii;

@ -1244,7 +1244,7 @@ void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAdd
 * Return Value: none
 *
 */
-VOID MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, UINT uDelay)
+void MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, UINT uDelay)
 {
 BYTE byValue;
 UINT uu,ii;
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@ -1075,7 +1075,7 @@
 /*---------------------  Export Functions  --------------------------*/

 extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
-VOID MACvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyMacRegs);
+void MACvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyMacRegs);

 BOOL MACbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
 BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
@ -1083,32 +1083,32 @@ BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
 BOOL MACbIsIntDisable(DWORD_PTR dwIoBase);

 BYTE MACbyReadMultiAddr(DWORD_PTR dwIoBase, UINT uByteIdx);
-VOID MACvWriteMultiAddr(DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData);
-VOID MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
-VOID MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
+void MACvWriteMultiAddr(DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData);
+void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
+void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);

-VOID MACvSetRxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
-VOID MACvGetRxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);
+void MACvSetRxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
+void MACvGetRxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);

-VOID MACvSetTxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
-VOID MACvGetTxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);
+void MACvSetTxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
+void MACvGetTxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);

-VOID MACvSetDmaLength(DWORD_PTR dwIoBase, BYTE byDmaLength);
-VOID MACvGetDmaLength(DWORD_PTR dwIoBase, PBYTE pbyDmaLength);
+void MACvSetDmaLength(DWORD_PTR dwIoBase, BYTE byDmaLength);
+void MACvGetDmaLength(DWORD_PTR dwIoBase, PBYTE pbyDmaLength);

-VOID MACvSetShortRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
-VOID MACvGetShortRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);
+void MACvSetShortRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
+void MACvGetShortRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);

-VOID MACvSetLongRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
-VOID MACvGetLongRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);
+void MACvSetLongRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
+void MACvGetLongRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);

-VOID MACvSetLoopbackMode(DWORD_PTR dwIoBase, BYTE byLoopbackMode);
+void MACvSetLoopbackMode(DWORD_PTR dwIoBase, BYTE byLoopbackMode);
 BOOL MACbIsInLoopbackMode(DWORD_PTR dwIoBase);

-VOID MACvSetPacketFilter(DWORD_PTR dwIoBase, WORD wFilterType);
+void MACvSetPacketFilter(DWORD_PTR dwIoBase, WORD wFilterType);

-VOID MACvSaveContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
-VOID MACvRestoreContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
+void MACvSaveContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
+void MACvRestoreContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
 BOOL MACbCompareContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);

 BOOL MACbSoftwareReset(DWORD_PTR dwIoBase);
@ -1117,14 +1117,14 @@ BOOL MACbSafeRxOff(DWORD_PTR dwIoBase);
 BOOL MACbSafeTxOff(DWORD_PTR dwIoBase);
 BOOL MACbSafeStop(DWORD_PTR dwIoBase);
 BOOL MACbShutdown(DWORD_PTR dwIoBase);
-VOID MACvInitialize(DWORD_PTR dwIoBase);
-VOID MACvSetCurrRx0DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrRx1DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrTXDescAddr(int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrTx0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
-VOID MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvInitialize(DWORD_PTR dwIoBase);
+void MACvSetCurrRx0DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrRx1DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrTXDescAddr(int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrTx0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
+void MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
 void MACvTimer0MicroSDelay(DWORD_PTR dwIoBase, UINT uDelay);
 void MACvOneShotTimer0MicroSec(DWORD_PTR dwIoBase, UINT uDelayTime);
 void MACvOneShotTimer1MicroSec(DWORD_PTR dwIoBase, UINT uDelayTime);
--- a/drivers/staging/vt6655/michael.c
+++ b/drivers/staging/vt6655/michael.c
@ -49,12 +49,12 @@
 /*---------------------  Static Functions  --------------------------*/
 /*
 static DWORD s_dwGetUINT32(BYTE * p);         // Get DWORD from 4 bytes LSByte first
-static VOID s_vPutUINT32(BYTE* p, DWORD val); // Put DWORD into 4 bytes LSByte first
+static void s_vPutUINT32(BYTE* p, DWORD val); // Put DWORD into 4 bytes LSByte first
 */
-static VOID s_vClear(void);                       // Clear the internal message,
+static void s_vClear(void);                       // Clear the internal message,
                                              // resets the object to the state just after construction.
-static VOID s_vSetKey(DWORD dwK0, DWORD dwK1);
-static VOID s_vAppendByte(BYTE b);            // Add a single byte to the internal message
+static void s_vSetKey(DWORD dwK0, DWORD dwK1);
+static void s_vAppendByte(BYTE b);            // Add a single byte to the internal message

 /*---------------------  Export Variables  --------------------------*/
 static DWORD  L, R;           // Current state
@ -78,7 +78,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
    return res;
 }

-static VOID s_vPutUINT32 (BYTE* p, DWORD val)
+static void s_vPutUINT32 (BYTE* p, DWORD val)
 // Convert from DWORD to BYTE[] in a portable way
 {
    UINT i;
@ -90,7 +90,7 @@ static VOID s_vPutUINT32 (BYTE* p, DWORD val)
 }
 */

-static VOID s_vClear (void)
+static void s_vClear (void)
 {
    // Reset the state to the empty message.
    L = K0;
@ -99,7 +99,7 @@ static VOID s_vClear (void)
    M = 0;
 }

-static VOID s_vSetKey (DWORD dwK0, DWORD dwK1)
+static void s_vSetKey (DWORD dwK0, DWORD dwK1)
 {
    // Set the key
    K0 = dwK0;
@ -108,7 +108,7 @@ static VOID s_vSetKey (DWORD dwK0, DWORD dwK1)
    s_vClear();
 }

-static VOID s_vAppendByte (BYTE b)
+static void s_vAppendByte (BYTE b)
 {
    // Append the byte to our word-sized buffer
    M |= b << (8*nBytesInM);
@ -131,14 +131,14 @@ static VOID s_vAppendByte (BYTE b)
    }
 }

-VOID MIC_vInit (DWORD dwK0, DWORD dwK1)
+void MIC_vInit (DWORD dwK0, DWORD dwK1)
 {
    // Set the key
    s_vSetKey(dwK0, dwK1);
 }


-VOID MIC_vUnInit (void)
+void MIC_vUnInit (void)
 {
    // Wipe the key material
    K0 = 0;
@ -149,7 +149,7 @@ VOID MIC_vUnInit (void)
    s_vClear();
 }

-VOID MIC_vAppend (PBYTE src, UINT nBytes)
+void MIC_vAppend (PBYTE src, UINT nBytes)
 {
    // This is simple
    while (nBytes > 0)
@ -159,7 +159,7 @@ VOID MIC_vAppend (PBYTE src, UINT nBytes)
    }
 }

-VOID MIC_vGetMIC (PDWORD pdwL, PDWORD pdwR)
+void MIC_vGetMIC (PDWORD pdwL, PDWORD pdwR)
 {
    // Append the minimum padding
    s_vAppendByte(0x5a);
--- a/drivers/staging/vt6655/michael.h
+++ b/drivers/staging/vt6655/michael.h
@ -35,16 +35,16 @@

 /*---------------------  Export Types  ------------------------------*/

-VOID MIC_vInit(DWORD dwK0, DWORD dwK1);
+void MIC_vInit(DWORD dwK0, DWORD dwK1);

-VOID MIC_vUnInit(void);
+void MIC_vUnInit(void);

 // Append bytes to the message to be MICed
-VOID MIC_vAppend(PBYTE src, UINT nBytes);
+void MIC_vAppend(PBYTE src, UINT nBytes);

 // Get the MIC result. Destination should accept 8 bytes of result.
 // This also resets the message to empty.
-VOID MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);
+void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);

 /*---------------------  Export Macros ------------------------------*/

--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@ -74,7 +74,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 -*/


-VOID
+void
 PSvEnablePowerSaving(
    IN HANDLE hDeviceContext,
    IN WORD wListenInterval
@ -144,7 +144,7 @@ PSvEnablePowerSaving(
 *
 -*/

-VOID
+void
 PSvDisablePowerSaving(
    IN HANDLE hDeviceContext
    )
@ -250,7 +250,7 @@ PSbConsiderPowerDown(



-VOID
+void
 PSvSendPSPOLL(
    IN HANDLE hDeviceContext
    )
--- a/drivers/staging/vt6655/power.h
+++ b/drivers/staging/vt6655/power.h
@ -55,18 +55,18 @@ PSbConsiderPowerDown(
    IN BOOL bCheckCountToWakeUp
    );

-VOID
+void
 PSvDisablePowerSaving(
    IN HANDLE hDeviceContext
    );

-VOID
+void
 PSvEnablePowerSaving(
    IN HANDLE hDeviceContext,
    IN WORD wListenInterval
    );

-VOID
+void
 PSvSendPSPOLL(
    IN HANDLE hDeviceContext
    );
--- a/drivers/staging/vt6655/rc4.c
+++ b/drivers/staging/vt6655/rc4.c
@ -32,7 +32,7 @@

 #include "rc4.h"

-VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
+void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
 {
    UINT  ust1, ust2;
    UINT  keyindex;
@ -78,7 +78,7 @@ UINT rc4_byte(PRC4Ext pRC4)
    return pbyst[(ustx + usty) & 0xff];
 }

-VOID rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
+void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
                     PBYTE pbySrc, UINT cbData_len)
 {
    UINT ii;
--- a/drivers/staging/vt6655/rc4.h
+++ b/drivers/staging/vt6655/rc4.h
@ -40,7 +40,7 @@ typedef struct {
    BYTE abystate[256];
 } RC4Ext, *PRC4Ext;

-VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len);
+void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len);
 UINT rc4_byte(PRC4Ext pRC4);
 void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len);

--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@ -1201,7 +1201,7 @@ DWORD   dwMax7230Pwr = 0;
 * Return Value: none
 *
 -*/
-VOID
+void
 RFvRSSITodBm (
    IN  PSDevice pDevice,
    IN  BYTE     byCurrRSSI,
--- a/drivers/staging/vt6655/rf.h
+++ b/drivers/staging/vt6655/rf.h
@ -89,7 +89,7 @@ BOOL RFbRawSetPower(
    IN  UINT      uRATE
    );

-VOID
+void
 RFvRSSITodBm(
    IN  PSDevice pDevice,
    IN  BYTE     byCurrRSSI,
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@ -115,7 +115,7 @@ const WORD wFB_Opt1[2][5] = {


 static
-VOID
+void
 s_vFillTxKey(
    IN  PSDevice   pDevice,
    IN  PBYTE      pbyBuf,
@ -129,7 +129,7 @@ s_vFillTxKey(


 static
-VOID
+void
 s_vFillRTSHead(
    IN PSDevice         pDevice,
    IN BYTE             byPktType,
@ -143,7 +143,7 @@ s_vFillRTSHead(
    );

 static
-VOID
+void
 s_vGenerateTxParameter(
    IN PSDevice         pDevice,
    IN  BYTE            byPktType,
@ -210,7 +210,7 @@ s_uFillDataHead (


 static
-VOID
+void
 s_vFillTxKey (
    IN  PSDevice   pDevice,
    IN  PBYTE      pbyBuf,
@ -328,7 +328,7 @@ s_vFillTxKey (


 static
-VOID
+void
 s_vSWencryption (
    IN  PSDevice            pDevice,
    IN  PSKeyItem           pTransmitKey,
@ -851,7 +851,7 @@ s_uFillDataHead (


 static
-VOID
+void
 s_vFillRTSHead (
    IN PSDevice         pDevice,
    IN BYTE             byPktType,
@ -1045,7 +1045,7 @@ s_vFillRTSHead (
 }

 static
-VOID
+void
 s_vFillCTSHead (
    IN PSDevice pDevice,
    IN UINT     uDMAIdx,
@ -1150,7 +1150,7 @@ s_vFillCTSHead (
 -*/
 // UINT            cbFrameSize,//Hdr+Payload+FCS
 static
-VOID
+void
 s_vGenerateTxParameter (
    IN PSDevice         pDevice,
    IN BYTE             byPktType,
@ -1268,7 +1268,7 @@ s_vGenerateTxParameter (
    UINT  cbFragmentSize,//Hdr+payoad+FCS
 */
 static
-VOID
+void
 s_vFillFragParameter(
    IN PSDevice pDevice,
    IN PBYTE    pbyBuffer,
@ -2093,7 +2093,7 @@ s_cbFillTxBufHead (
 }


-VOID
+void
 vGenerateFIFOHeader (
    IN  PSDevice         pDevice,
    IN  BYTE             byPktType,
@ -2264,7 +2264,7 @@ vGenerateFIFOHeader (
 *
 -*/

-VOID
+void
 vGenerateMACHeader (
    IN PSDevice         pDevice,
    IN PBYTE            pbyBufferAddr,
@ -2825,7 +2825,7 @@ cbGetFragCount (
 }


-VOID
+void
 vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen) {

    PSTxDesc        pFrstTD;
--- a/drivers/staging/vt6655/rxtx.h
+++ b/drivers/staging/vt6655/rxtx.h
@ -40,7 +40,7 @@
 /*---------------------  Export Functions  --------------------------*/

 /*
-VOID vGenerateMACHeader(
+void vGenerateMACHeader(
    IN PSDevice pDevice,
    IN DWORD dwTxBufferAddr,
    IN PBYTE pbySkbData,
@ -50,7 +50,7 @@ VOID vGenerateMACHeader(
    OUT PUINT pcbAppendPayload
     );

-VOID vProcessRxMACHeader (
+void vProcessRxMACHeader (
    IN  PSDevice pDevice,
    IN  DWORD dwRxBufferAddr,
    IN  UINT cbPacketSize,
@ -60,7 +60,7 @@ VOID vProcessRxMACHeader (
 */


-VOID
+void
 vGenerateMACHeader (
    IN PSDevice         pDevice,
    IN PBYTE            pbyBufferAddr,
@ -82,7 +82,7 @@ cbGetFragCount(
    );


-VOID
+void
 vGenerateFIFOHeader (
    IN  PSDevice         pDevice,
    IN  BYTE             byPktTyp,
@ -100,7 +100,7 @@ vGenerateFIFOHeader (
    );


-VOID vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen);
+void vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen);
 CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
 CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);

--- a/drivers/staging/vt6655/srom.h
+++ b/drivers/staging/vt6655/srom.h
@ -150,7 +150,7 @@ void SROMvWriteAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs);
 void SROMvReadEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress);
 void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress);

-VOID SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId);
+void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId);

 BOOL SROMbAutoLoad (DWORD_PTR dwIoBase);

--- a/drivers/staging/vt6655/tkip.c
+++ b/drivers/staging/vt6655/tkip.c
@ -183,7 +183,7 @@ unsigned int rotr1(unsigned int a)
 * Return Value: none
 *
 */
-VOID TKIPvMixKey(
+void TKIPvMixKey(
    PBYTE   pbyTKey,
    PBYTE   pbyTA,
    WORD    wTSC15_0,
--- a/drivers/staging/vt6655/tkip.h
+++ b/drivers/staging/vt6655/tkip.h
@ -46,7 +46,7 @@

 /*---------------------  Export Functions  --------------------------*/

-VOID TKIPvMixKey(
+void TKIPvMixKey(
    PBYTE   pbyTKey,
    PBYTE   pbyTA,
    WORD    wTSC15_0,
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@ -33,10 +33,6 @@

 /******* Common definitions and typedefs ***********************************/

-#ifndef VOID
-#define VOID            void
-#endif
-
 #ifndef IN
 #define IN
 #endif
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@ -69,7 +69,7 @@
 * Return Value: none
 *
 -*/
-VOID
+void
 VNTWIFIvSetOPMode (
    IN PVOID pMgmtHandle,
    IN WMAC_CONFIG_MODE eOPMode
@ -98,7 +98,7 @@ VNTWIFIvSetOPMode (
 * Return Value: none
 *
 -*/
-VOID
+void
 VNTWIFIvSetIBSSParameter (
    IN PVOID pMgmtHandle,
    IN WORD  wBeaconPeriod,
@ -306,7 +306,7 @@ VNTWIFIbyGetACKTxRate (
 * Return Value: none
 *
 -*/
-VOID
+void
 VNTWIFIvSetAuthenticationMode (
    IN PVOID pMgmtHandle,
    IN WMAC_AUTHENTICATION_MODE eAuthMode
@ -338,7 +338,7 @@ VNTWIFIvSetAuthenticationMode (
 * Return Value: none
 *
 -*/
-VOID
+void
 VNTWIFIvSetEncryptionMode (
    IN PVOID pMgmtHandle,
    IN WMAC_ENCRYPTION_MODE eEncryptionMode
@ -379,7 +379,7 @@ VNTWIFIbConfigPhyMode (
 }


-VOID
+void
 VNTWIFIbGetConfigPhyMode (
    IN  PVOID pMgmtHandle,
    OUT PVOID pePhyType
@ -424,7 +424,7 @@ VNTWIFIbGetConfigPhyMode (
 *
 -*/

-VOID
+void
 VNTWIFIvQueryBSSList (
    IN PVOID    pMgmtHandle,
    OUT PUINT   puBSSCount,
@ -454,7 +454,7 @@ VNTWIFIvQueryBSSList (



-VOID
+void
 VNTWIFIvGetNextBSS (
    IN PVOID            pMgmtHandle,
    IN PVOID            pvCurrentBSS,
@ -494,7 +494,7 @@ VNTWIFIvGetNextBSS (
 * Return Value: none
 *
 -*/
-VOID
+void
 VNTWIFIvUpdateNodeTxCounter(
    IN PVOID    pMgmtHandle,
    IN PBYTE    pbyDestAddress,
@ -529,7 +529,7 @@ VNTWIFIvUpdateNodeTxCounter(
 }


-VOID
+void
 VNTWIFIvGetTxRate(
    IN PVOID    pMgmtHandle,
    IN PBYTE    pbyDestAddress,
@ -702,7 +702,7 @@ VNTWIFIwGetMaxSupportRate(
 }


-VOID
+void
 VNTWIFIvSet11h (
    IN PVOID pMgmtObject,
    IN BOOL  b11hEnable
--- a/drivers/staging/vt6655/vntwifi.h
+++ b/drivers/staging/vt6655/vntwifi.h
@ -140,7 +140,7 @@ typedef enum tagWMAC_POWER_MODE {

 /*---------------------  Export Functions  --------------------------*/

-VOID
+void
 VNTWIFIvSetIBSSParameter (
    IN PVOID pMgmtHandle,
    IN WORD  wBeaconPeriod,
@ -148,7 +148,7 @@ VNTWIFIvSetIBSSParameter (
    IN UINT  uChannel
    );

-VOID
+void
 VNTWIFIvSetOPMode (
    IN PVOID pMgmtHandle,
    IN WMAC_CONFIG_MODE eOPMode
@ -182,13 +182,13 @@ VNTWIFIbyGetACKTxRate (
    IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs
    );

-VOID
+void
 VNTWIFIvSetAuthenticationMode (
    IN PVOID pMgmtHandle,
    IN WMAC_AUTHENTICATION_MODE eAuthMode
    );

-VOID
+void
 VNTWIFIvSetEncryptionMode (
    IN PVOID pMgmtHandle,
    IN WMAC_ENCRYPTION_MODE eEncryptionMode
@ -201,13 +201,13 @@ VNTWIFIbConfigPhyMode(
    IN CARD_PHY_TYPE ePhyType
    );

-VOID
+void
 VNTWIFIbGetConfigPhyMode(
    IN  PVOID pMgmtHandle,
    OUT PVOID pePhyType
    );

-VOID
+void
 VNTWIFIvQueryBSSList(
    IN PVOID    pMgmtHandle,
    OUT PUINT   puBSSCount,
@ -217,7 +217,7 @@ VNTWIFIvQueryBSSList(



-VOID
+void
 VNTWIFIvGetNextBSS (
    IN PVOID            pMgmtHandle,
    IN PVOID            pvCurrentBSS,
@ -226,7 +226,7 @@ VNTWIFIvGetNextBSS (



-VOID
+void
 VNTWIFIvUpdateNodeTxCounter(
    IN PVOID    pMgmtHandle,
    IN PBYTE    pbyDestAddress,
@ -236,7 +236,7 @@ VNTWIFIvUpdateNodeTxCounter(
    );


-VOID
+void
 VNTWIFIvGetTxRate(
    IN PVOID    pMgmtHandle,
    IN PBYTE    pbyDestAddress,
@ -280,7 +280,7 @@ VNTWIFIwGetMaxSupportRate(
    );

 // for 802.11h
-VOID
+void
 VNTWIFIvSet11h (
    IN PVOID pMgmtObject,
    IN BOOL  b11hEnable
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@ -66,7 +66,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 /*---------------------  Static Functions  --------------------------*/

 static
-VOID
+void
 s_vProbeChannel(
    IN PSDevice pDevice
    );
@ -202,7 +202,7 @@ vAdHocBeaconRestart(PSDevice pDevice)
 -*/

 static
-VOID
+void
 s_vProbeChannel(
    IN PSDevice pDevice
    )
@ -317,7 +317,7 @@ s_MgrMakeProbeRequest(



-VOID
+void
 vCommandTimerWait(
    IN HANDLE    hDeviceContext,
    IN UINT MSecond
@ -337,7 +337,7 @@ vCommandTimerWait(



-VOID
+void
 vCommandTimer (
    IN  HANDLE      hDeviceContext
    )
@ -1081,7 +1081,7 @@ BOOL bClearBSSID_SCAN (
 }

 //mike add:reset command timer
-VOID
+void
 vResetCommandTimer(
    IN HANDLE      hDeviceContext
    )
@ -1105,7 +1105,7 @@ vResetCommandTimer(


 #ifdef TxInSleep
-VOID
+void
 BSSvSecondTxData(
    IN  HANDLE      hDeviceContext
    )
--- a/drivers/staging/vt6655/wcmd.h
+++ b/drivers/staging/vt6655/wcmd.h
@ -109,12 +109,12 @@ typedef enum tagCMD_STATE {


 /*---------------------  Export Functions  --------------------------*/
-VOID
+void
 vResetCommandTimer(
    IN HANDLE      hDeviceContext
    );

-VOID
+void
 vCommandTimer (
    IN  HANDLE hDeviceContext
    );
@ -130,13 +130,13 @@ bScheduleCommand(
    IN PBYTE       pbyItem0
    );

-VOID
+void
 vCommandTimerWait(
    IN HANDLE      hDeviceContext,
    IN UINT MSecond
    );
 #ifdef TxInSleep
-VOID
+void
 BSSvSecondTxData(
    IN  HANDLE      hDeviceContext
    );
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@ -113,7 +113,7 @@ s_MgrMakeAssocRequest(
    );

 static
-VOID
+void
 s_vMgrRxAssocRequest(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest(
    );

 static
-VOID
+void
 s_vMgrRxAssocResponse(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -144,7 +144,7 @@ s_vMgrRxAssocResponse(
    );

 static
-VOID
+void
 s_vMgrRxDisassociation(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -153,7 +153,7 @@ s_vMgrRxDisassociation(

 // Authentication/deauthen functions
 static
-VOID
+void
 s_vMgrRxAuthenSequence_1(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1(
    );

 static
-VOID
+void
 s_vMgrRxAuthenSequence_2(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2(
    );

 static
-VOID
+void
 s_vMgrRxAuthenSequence_3(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3(
    );

 static
-VOID
+void
 s_vMgrRxAuthenSequence_4(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4(
    );

 static
-VOID
+void
 s_vMgrRxAuthentication(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -193,7 +193,7 @@ s_vMgrRxAuthentication(
    );

 static
-VOID
+void
 s_vMgrRxDeauthentication(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -203,7 +203,7 @@ s_vMgrRxDeauthentication(
 // Scan functions
 // probe request/response functions
 static
-VOID
+void
 s_vMgrRxProbeRequest(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -211,7 +211,7 @@ s_vMgrRxProbeRequest(
    );

 static
-VOID
+void
 s_vMgrRxProbeResponse(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -220,7 +220,7 @@ s_vMgrRxProbeResponse(

 // beacon functions
 static
-VOID
+void
 s_vMgrRxBeacon(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -229,7 +229,7 @@ s_vMgrRxBeacon(
    );

 static
-VOID
+void
 s_vMgrFormatTIM(
    IN PSMgmtObject pMgmt,
    IN PWLAN_IE_TIM pTIM
@ -299,7 +299,7 @@ s_MgrMakeProbeResponse(

 // received status
 static
-VOID
+void
 s_vMgrLogStatus(
    IN PSMgmtObject pMgmt,
    IN WORD wStatus
@ -307,7 +307,7 @@ s_vMgrLogStatus(


 static
-VOID
+void
 s_vMgrSynchBSS (
    IN PSDevice      pDevice,
    IN UINT          uBSSMode,
@ -324,7 +324,7 @@ s_bCipherMatch (
    OUT PBYTE                           pbyCCSGK
    );

- static VOID  Encyption_Rebuild(
+ static void  Encyption_Rebuild(
    IN PSDevice pDevice,
    IN PKnownBSS pCurr
 );
@ -347,7 +347,7 @@ s_bCipherMatch (
 *
 -*/

-VOID
+void
 vMgrObjectInit(
    IN  HANDLE hDeviceContext
    )
@ -431,7 +431,7 @@ vMgrTimerInit(
 *
 -*/

-VOID
+void
 vMgrObjectReset(
    IN  HANDLE hDeviceContext
    )
@ -460,7 +460,7 @@ vMgrObjectReset(
 -*/


-VOID
+void
 vMgrAssocBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
@ -536,7 +536,7 @@ vMgrAssocBeginSta(
 *
 -*/

-VOID
+void
 vMgrReAssocBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
@ -615,7 +615,7 @@ vMgrReAssocBeginSta(
 *
 -*/

-VOID
+void
 vMgrDisassocBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
@ -678,7 +678,7 @@ vMgrDisassocBeginSta(
 -*/

 static
-VOID
+void
 s_vMgrRxAssocRequest(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -840,7 +840,7 @@ s_vMgrRxAssocRequest(
 -*/

 static
-VOID
+void
 s_vMgrRxReAssocRequest(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -990,7 +990,7 @@ s_vMgrRxReAssocRequest(
 -*/

 static
-VOID
+void
 s_vMgrRxAssocResponse(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1150,7 +1150,7 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
 *
 -*/

-VOID
+void
 vMgrAuthenBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject  pMgmt,
@ -1208,7 +1208,7 @@ vMgrAuthenBeginSta(
 *
 -*/

-VOID
+void
 vMgrDeAuthenBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject  pMgmt,
@ -1265,7 +1265,7 @@ vMgrDeAuthenBeginSta(
 -*/

 static
-VOID
+void
 s_vMgrRxAuthentication(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1323,7 +1323,7 @@ s_vMgrRxAuthentication(


 static
-VOID
+void
 s_vMgrRxAuthenSequence_1(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1429,7 +1429,7 @@ s_vMgrRxAuthenSequence_1(
 -*/

 static
-VOID
+void
 s_vMgrRxAuthenSequence_2(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1531,7 +1531,7 @@ s_vMgrRxAuthenSequence_2(
 -*/

 static
-VOID
+void
 s_vMgrRxAuthenSequence_3(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1619,7 +1619,7 @@ reply:
 *
 -*/
 static
-VOID
+void
 s_vMgrRxAuthenSequence_4(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1658,7 +1658,7 @@ s_vMgrRxAuthenSequence_4(
 -*/

 static
-VOID
+void
 s_vMgrRxDisassociation(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1737,7 +1737,7 @@ s_vMgrRxDisassociation(
 -*/

 static
-VOID
+void
 s_vMgrRxDeauthentication(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -1863,7 +1863,7 @@ ChannelExceedZoneType(
 -*/

 static
-VOID
+void
 s_vMgrRxBeacon(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -2384,7 +2384,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
 *    CMD_STATUS
 *
 -*/
-VOID
+void
 vMgrCreateOwnIBSS(
    IN  HANDLE hDeviceContext,
    OUT PCMD_STATUS pStatus
@ -2651,7 +2651,7 @@ vMgrCreateOwnIBSS(
 *
 -*/

-VOID
+void
 vMgrJoinBSSBegin(
    IN  HANDLE hDeviceContext,
    OUT PCMD_STATUS pStatus
@ -2920,7 +2920,7 @@ vMgrJoinBSSBegin(
 *
 -*/
 static
-VOID
+void
 s_vMgrSynchBSS (
    IN PSDevice      pDevice,
    IN UINT          uBSSMode,
@ -3088,7 +3088,7 @@ s_vMgrSynchBSS (

 //mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
 //                   ,need reset eAuthenMode and eEncryptionStatus
- static VOID  Encyption_Rebuild(
+ static void  Encyption_Rebuild(
    IN PSDevice pDevice,
    IN PKnownBSS pCurr
 )
@ -3140,12 +3140,12 @@ s_vMgrSynchBSS (
 *
 *
 * Return Value:
- *    VOID
+ *    void
 *
 -*/

 static
-VOID
+void
 s_vMgrFormatTIM(
    IN PSMgmtObject pMgmt,
    IN PWLAN_IE_TIM pTIM
@ -4313,7 +4313,7 @@ s_MgrMakeReAssocResponse(
 -*/

 static
-VOID
+void
 s_vMgrRxProbeResponse(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -4438,7 +4438,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)


 static
-VOID
+void
 s_vMgrRxProbeRequest(
    IN PSDevice pDevice,
    IN PSMgmtObject pMgmt,
@ -4534,7 +4534,7 @@ s_vMgrRxProbeRequest(
 -*/


-VOID
+void
 vMgrRxManagePacket(
    IN  HANDLE hDeviceContext,
    IN PSMgmtObject pMgmt,
@ -4738,7 +4738,7 @@ bMgrPrepareBeaconToSend(
 *
 -*/
 static
-VOID
+void
 s_vMgrLogStatus(
    IN PSMgmtObject pMgmt,
    IN WORD  wStatus
@ -4868,7 +4868,7 @@ bAdd_PMKID_Candidate (
 * Return Value: none.
 *
 -*/
-VOID
+void
 vFlush_PMKID_Candidate (
    IN HANDLE hDeviceContext
    )
--- a/drivers/staging/vt6655/wmgr.h
+++ b/drivers/staging/vt6655/wmgr.h
@ -409,7 +409,7 @@ vMgrTimerInit(
    IN  HANDLE hDeviceContext
    );

-VOID
+void
 vMgrObjectReset(
    IN  HANDLE hDeviceContext
    );
@ -421,14 +421,14 @@ vMgrAssocBeginSta(
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrReAssocBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrDisassocBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
@ -437,26 +437,26 @@ vMgrDisassocBeginSta(
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrAuthenBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrCreateOwnIBSS(
    IN  HANDLE hDeviceContext,
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrJoinBSSBegin(
    IN  HANDLE hDeviceContext,
    OUT PCMD_STATUS pStatus
    );

-VOID
+void
 vMgrRxManagePacket(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject pMgmt,
@ -464,14 +464,14 @@ vMgrRxManagePacket(
    );

 /*
-VOID
+void
 vMgrScanBegin(
    IN  HANDLE hDeviceContext,
    OUT PCMD_STATUS pStatus
    );
 */

-VOID
+void
 vMgrDeAuthenBeginSta(
    IN  HANDLE hDeviceContext,
    IN  PSMgmtObject  pMgmt,
@ -494,7 +494,7 @@ bAdd_PMKID_Candidate (
    IN PSRSNCapObject psRSNCapObj
    );

-VOID
+void
 vFlush_PMKID_Candidate (
    IN HANDLE hDeviceContext
    );
--- a/drivers/staging/vt6655/wpa.c
+++ b/drivers/staging/vt6655/wpa.c
@ -68,7 +68,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 };
 *
 -*/

-VOID
+void
 WPA_ClearRSN (
    IN PKnownBSS        pBSSList
    )
@ -104,7 +104,7 @@ WPA_ClearRSN (
 * Return Value: none.
 *
 -*/
-VOID
+void
 WPA_ParseRSN (
    IN PKnownBSS        pBSSList,
    IN PWLAN_IE_RSN_EXT pRSN
--- a/drivers/staging/vt6655/wpa.h
+++ b/drivers/staging/vt6655/wpa.h
@ -58,12 +58,12 @@

 /*---------------------  Export Functions  --------------------------*/

-VOID
+void
 WPA_ClearRSN(
    IN PKnownBSS        pBSSList
    );

-VOID
+void
 WPA_ParseRSN(
    IN PKnownBSS        pBSSList,
    IN PWLAN_IE_RSN_EXT pRSN
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@ -72,7 +72,7 @@ const BYTE abyOUIPSK[4]     = { 0x00, 0x0F, 0xAC, 0x02 };
 * Return Value: none.
 *
 -*/
-VOID
+void
 WPA2_ClearRSN (
    IN PKnownBSS        pBSSNode
    )
@ -107,7 +107,7 @@ WPA2_ClearRSN (
 * Return Value: none.
 *
 -*/
-VOID
+void
 WPA2vParseRSN (
    IN PKnownBSS        pBSSNode,
    IN PWLAN_IE_RSN     pRSN
--- a/drivers/staging/vt6655/wpa2.h
+++ b/drivers/staging/vt6655/wpa2.h
@ -58,12 +58,12 @@ typedef struct tagSPMKIDCache {

 /*---------------------  Export Functions  --------------------------*/

-VOID
+void
 WPA2_ClearRSN (
    IN PKnownBSS        pBSSNode
    );

-VOID
+void
 WPA2vParseRSN (
    IN PKnownBSS        pBSSNode,
    IN PWLAN_IE_RSN     pRSN