From: Andres More <more.andres@xxxxxxxxx> Signed-off-by: Andres More <more.andres@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> --- drivers/staging/vt6656/aes_ccmp.h | 2 +- drivers/staging/vt6656/baseband.h | 2 +- drivers/staging/vt6656/bssdb.h | 2 +- drivers/staging/vt6656/card.h | 5 +---- drivers/staging/vt6656/control.h | 5 +---- drivers/staging/vt6656/datarate.h | 3 +-- drivers/staging/vt6656/desc.h | 6 +----- drivers/staging/vt6656/dpc.h | 5 +---- drivers/staging/vt6656/firmware.h | 3 +-- drivers/staging/vt6656/hostap.h | 5 +---- drivers/staging/vt6656/int.h | 5 +---- drivers/staging/vt6656/iocmd.h | 4 +--- drivers/staging/vt6656/ioctl.h | 5 +---- drivers/staging/vt6656/iowpa.h | 4 +--- drivers/staging/vt6656/iwctl.h | 5 +---- drivers/staging/vt6656/key.h | 3 +-- drivers/staging/vt6656/mac.h | 2 +- drivers/staging/vt6656/mib.h | 5 +---- drivers/staging/vt6656/michael.h | 4 +--- drivers/staging/vt6656/power.h | 2 +- drivers/staging/vt6656/rc4.h | 2 +- drivers/staging/vt6656/rf.h | 5 +---- drivers/staging/vt6656/rndis.h | 3 +-- drivers/staging/vt6656/rxtx.h | 5 +---- drivers/staging/vt6656/srom.h | 2 +- drivers/staging/vt6656/tcrc.h | 5 +---- drivers/staging/vt6656/tether.h | 5 +---- drivers/staging/vt6656/tkip.h | 5 +---- drivers/staging/vt6656/tmacro.h | 4 +--- drivers/staging/vt6656/ttype.h | 2 +- drivers/staging/vt6656/upc.h | 6 +----- drivers/staging/vt6656/usbpipe.h | 5 +---- drivers/staging/vt6656/wcmd.h | 2 +- drivers/staging/vt6656/wctl.h | 5 +---- drivers/staging/vt6656/wmgr.h | 2 +- drivers/staging/vt6656/wpa.h | 2 +- drivers/staging/vt6656/wpa2.h | 2 +- drivers/staging/vt6656/wpactl.h | 5 +---- 38 files changed, 38 insertions(+), 106 deletions(-) diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h index f2ba1d5..353bd21 100644 --- a/drivers/staging/vt6656/aes_ccmp.h +++ b/drivers/staging/vt6656/aes_ccmp.h @@ -43,4 +43,4 @@ /*--------------------- Export Functions --------------------------*/ BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize); -#endif //__AES_H__ +#endif /* __AES_CCMP_H__ */ diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h index fbc2847..9a1999b 100644 --- a/drivers/staging/vt6656/baseband.h +++ b/drivers/staging/vt6656/baseband.h @@ -143,4 +143,4 @@ void BBvUpdatePreEDThreshold( BOOL bScanning ); -#endif // __BASEBAND_H__ +#endif /* __BASEBAND_H__ */ diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h index 343bfac..2aaa933 100644 --- a/drivers/staging/vt6656/bssdb.h +++ b/drivers/staging/vt6656/bssdb.h @@ -356,4 +356,4 @@ BSSvClearAnyBSSJoinRecord( HANDLE hDeviceContext ); -#endif //__BSSDB_H__ +#endif /* __BSSDB_H__ */ diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 2f7335e..770ee6a 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -91,7 +91,4 @@ CARDbChannelSwitch ( BYTE byCount ); -#endif // __CARD_H__ - - - +#endif /* __CARD_H__ */ diff --git a/drivers/staging/vt6656/control.h b/drivers/staging/vt6656/control.h index 106c9e9..146b450 100644 --- a/drivers/staging/vt6656/control.h +++ b/drivers/staging/vt6656/control.h @@ -77,7 +77,4 @@ void ControlvMaskByte( BYTE byData ); -#endif // __RCV_H__ - - - +#endif /* __CONTROL_H__ */ diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h index da51854..ae37eb6 100644 --- a/drivers/staging/vt6656/datarate.h +++ b/drivers/staging/vt6656/datarate.h @@ -106,5 +106,4 @@ DATARATEbyGetRateIdx( BYTE byRate ); - -#endif //__DATARATE_H__ +#endif /* __DATARATE_H__ */ diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h index c87ea6b..07f794e 100644 --- a/drivers/staging/vt6656/desc.h +++ b/drivers/staging/vt6656/desc.h @@ -436,8 +436,4 @@ SKeyEntry; /*--------------------- Export Functions --------------------------*/ - - - -#endif // __DESC_H__ - +#endif /* __DESC_H__ */ diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h index 457db77..7ea3ad9 100644 --- a/drivers/staging/vt6656/dpc.h +++ b/drivers/staging/vt6656/dpc.h @@ -58,7 +58,4 @@ RXbBulkInProcessData( ULONG BytesToIndicate ); -#endif // __RXTX_H__ - - - +#endif /* __RXTX_H__ */ diff --git a/drivers/staging/vt6656/firmware.h b/drivers/staging/vt6656/firmware.h index 10e84cd..b2f5b58 100644 --- a/drivers/staging/vt6656/firmware.h +++ b/drivers/staging/vt6656/firmware.h @@ -56,5 +56,4 @@ FIRMWAREbCheckVersion( PSDevice pDevice ); - -#endif // __FIRMWARE_H__ +#endif /* __FIRMWARE_H__ */ diff --git a/drivers/staging/vt6656/hostap.h b/drivers/staging/vt6656/hostap.h index 9e366dc..b660aee 100644 --- a/drivers/staging/vt6656/hostap.h +++ b/drivers/staging/vt6656/hostap.h @@ -64,7 +64,4 @@ int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p); -#endif // __HOSTAP_H__ - - - +#endif /* __HOSTAP_H__ */ diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index 20c96f5..cdf3551 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h @@ -74,7 +74,4 @@ INTnsProcessData( PSDevice pDevice ); -#endif // __INT_H__ - - - +#endif /* __INT_H__ */ diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index 49bfe15..67ec7d7 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h @@ -470,6 +470,4 @@ struct viawget_hostapd_param { /*--------------------- Export Functions --------------------------*/ - - -#endif //__IOCMD_H__ +#endif /* __IOCMD_H__ */ diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h index 46eb699..b307980 100644 --- a/drivers/staging/vt6656/ioctl.h +++ b/drivers/staging/vt6656/ioctl.h @@ -51,7 +51,4 @@ void vConfigWEPKey ( ); */ -#endif // __IOCTL_H__ - - - +#endif /* __IOCTL_H__ */ diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h index 5750b5b..da03edc 100644 --- a/drivers/staging/vt6656/iowpa.h +++ b/drivers/staging/vt6656/iowpa.h @@ -153,6 +153,4 @@ struct viawget_scan_result { /*--------------------- Export Functions --------------------------*/ - - -#endif //__IOWPA_H__ +#endif /* __IOWPA_H__ */ diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h index 3096de0..df9a4cf 100644 --- a/drivers/staging/vt6656/iwctl.h +++ b/drivers/staging/vt6656/iwctl.h @@ -223,7 +223,4 @@ int iwctl_siwmlme(struct net_device *dev, extern const struct iw_handler_def iwctl_handler_def; extern const struct iw_priv_args iwctl_private_args; -#endif // __IWCTL_H__ - - - +#endif /* __IWCTL_H__ */ diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h index 7aec57b..a108782 100644 --- a/drivers/staging/vt6656/key.h +++ b/drivers/staging/vt6656/key.h @@ -173,5 +173,4 @@ BOOL KeybSetAllGroupKey( BYTE byKeyDecMode ); -#endif // __KEY_H__ - +#endif /* __KEY_H__ */ diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index 1a7c2f5..4e3d11b 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -439,4 +439,4 @@ void MACvEnableBarkerPreambleMd(PSDevice pDevice); void MACvDisableBarkerPreambleMd(PSDevice pDevice); void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval); -#endif // __MAC_H__ +#endif /* __MAC_H__ */ diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h index d1d7817..8a532e8 100644 --- a/drivers/staging/vt6656/mib.h +++ b/drivers/staging/vt6656/mib.h @@ -417,7 +417,4 @@ STAvUpdateUSBCounter( NTSTATUS ntStatus ); -#endif // __MIB_H__ - - - +#endif /* __MIB_H__ */ diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h index 97de77b..52270d3 100644 --- a/drivers/staging/vt6656/michael.h +++ b/drivers/staging/vt6656/michael.h @@ -53,6 +53,4 @@ void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR); ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) ) #define ROR32( A, n ) ROL32( (A), 32-(n) ) -#endif //__MICHAEL_H__ - - +#endif /* __MICHAEL_H__ */ diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h index e83ac4e..c34e389 100644 --- a/drivers/staging/vt6656/power.h +++ b/drivers/staging/vt6656/power.h @@ -81,4 +81,4 @@ PSbIsNextTBTTWakeUp( HANDLE hDeviceContext ); -#endif //__POWER_H__ +#endif /* __POWER_H__ */ diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h index e65cae6..9cd1db9 100644 --- a/drivers/staging/vt6656/rc4.h +++ b/drivers/staging/vt6656/rc4.h @@ -44,4 +44,4 @@ 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); -#endif //__RC4_H__ +#endif /* __RC4_H__ */ diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h index 6c3faf8..7423d4d 100644 --- a/drivers/staging/vt6656/rf.h +++ b/drivers/staging/vt6656/rf.h @@ -94,7 +94,4 @@ BOOL s_bVT3226D0_11bLoCurrentAdjust( BOOL b11bMode ); -#endif // __RF_H__ - - - +#endif /* __RF_H__ */ diff --git a/drivers/staging/vt6656/rndis.h b/drivers/staging/vt6656/rndis.h index 1d32d81..ac842dd 100644 --- a/drivers/staging/vt6656/rndis.h +++ b/drivers/staging/vt6656/rndis.h @@ -158,5 +158,4 @@ typedef struct _CMD_CHANGE_BBTYPE /*--------------------- Export Functions --------------------------*/ - -#endif // _RNDIS_H_ +#endif /* _RNDIS_H_ */ diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 7c7e078..0269430 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -688,7 +688,4 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); -#endif // __RXTX_H__ - - - +#endif /* __RXTX_H__ */ diff --git a/drivers/staging/vt6656/srom.h b/drivers/staging/vt6656/srom.h index 4c89e7a..dba21a5 100644 --- a/drivers/staging/vt6656/srom.h +++ b/drivers/staging/vt6656/srom.h @@ -124,4 +124,4 @@ typedef struct tagSSromReg { /*--------------------- Export Functions --------------------------*/ -#endif // __EEPROM_H__ +#endif /* __EEPROM_H__ */ diff --git a/drivers/staging/vt6656/tcrc.h b/drivers/staging/vt6656/tcrc.h index 5faa48b..a41fc9b 100644 --- a/drivers/staging/vt6656/tcrc.h +++ b/drivers/staging/vt6656/tcrc.h @@ -47,7 +47,4 @@ DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); -#endif // __TCRC_H__ - - - +#endif /* __TCRC_H__ */ diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index af119dd..9b26033 100644 --- a/drivers/staging/vt6656/tether.h +++ b/drivers/staging/vt6656/tether.h @@ -230,7 +230,4 @@ BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); -#endif // __TETHER_H__ - - - +#endif /* __TETHER_H__ */ diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h index 3dfa7f5..47c3a85 100644 --- a/drivers/staging/vt6656/tkip.h +++ b/drivers/staging/vt6656/tkip.h @@ -54,7 +54,4 @@ void TKIPvMixKey( PBYTE pbyRC4Key ); -#endif // __TKIP_H__ - - - +#endif /* __TKIP_H__ */ diff --git a/drivers/staging/vt6656/tmacro.h b/drivers/staging/vt6656/tmacro.h index e96c140..3c81e2b 100644 --- a/drivers/staging/vt6656/tmacro.h +++ b/drivers/staging/vt6656/tmacro.h @@ -57,6 +57,4 @@ #define MAKEDWORD(lw, hw) ((DWORD)(((WORD)(lw)) | (((DWORD)((WORD)(hw))) << 16))) #endif -#endif // __TMACRO_H__ - - +#endif /* __TMACRO_H__ */ diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 5bbd4e3..a773e58 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -149,4 +149,4 @@ typedef void *HANDLE; typedef void *HANDLE; #endif -#endif // __TTYPE_H__ +#endif /* __TTYPE_H__ */ diff --git a/drivers/staging/vt6656/upc.h b/drivers/staging/vt6656/upc.h index acd1b66..be386ed 100644 --- a/drivers/staging/vt6656/upc.h +++ b/drivers/staging/vt6656/upc.h @@ -159,8 +159,4 @@ /*--------------------- Export Functions --------------------------*/ - - - -#endif // __UPC_H__ - +#endif /* __UPC_H__ */ diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h index 0f7cd2d..ee86d37 100644 --- a/drivers/staging/vt6656/usbpipe.h +++ b/drivers/staging/vt6656/usbpipe.h @@ -93,7 +93,4 @@ PIPEnsSendBulkOut( PUSB_SEND_CONTEXT pContext ); -#endif // __USBPIPE_H__ - - - +#endif /* __USBPIPE_H__ */ diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h index f3eac03..a14e564 100644 --- a/drivers/staging/vt6656/wcmd.h +++ b/drivers/staging/vt6656/wcmd.h @@ -147,4 +147,4 @@ BSSvSecondTxData( ); #endif -#endif //__WCMD_H__ +#endif /* __WCMD_H__ */ diff --git a/drivers/staging/vt6656/wctl.h b/drivers/staging/vt6656/wctl.h index a1ac479..c81dff7 100644 --- a/drivers/staging/vt6656/wctl.h +++ b/drivers/staging/vt6656/wctl.h @@ -102,7 +102,4 @@ BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFra UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); -#endif // __WCTL_H__ - - - +#endif /* __WCTL_H__ */ diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index d554715..02ecec9 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -498,4 +498,4 @@ vFlush_PMKID_Candidate ( HANDLE hDeviceContext ); -#endif // __WMGR_H__ +#endif /* __WMGR_H__ */ diff --git a/drivers/staging/vt6656/wpa.h b/drivers/staging/vt6656/wpa.h index 661f40d..889489a 100644 --- a/drivers/staging/vt6656/wpa.h +++ b/drivers/staging/vt6656/wpa.h @@ -81,4 +81,4 @@ WPAb_Is_RSN( PWLAN_IE_RSN_EXT pRSN ); -#endif // __WPA_H__ +#endif /* __WPA_H__ */ diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h index 6026005..367aece 100644 --- a/drivers/staging/vt6656/wpa2.h +++ b/drivers/staging/vt6656/wpa2.h @@ -75,4 +75,4 @@ WPA2uSetIEs( OUT PWLAN_IE_RSN pRSNIEs ); -#endif // __WPA2_H__ +#endif /* __WPA2_H__ */ diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h index 56179f0..3a2f15f 100644 --- a/drivers/staging/vt6656/wpactl.h +++ b/drivers/staging/vt6656/wpactl.h @@ -66,7 +66,4 @@ int wpa_set_wpadev(PSDevice pDevice, int val); int wpa_ioctl(PSDevice pDevice, struct iw_point *p); int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); -#endif // __WPACL_H__ - - - +#endif /* __WPACL_H__ */ -- 1.7.0.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel