diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c
index ff0e3dc..e207475 100644
--- a/core/rtw_efuse.c
+++ b/core/rtw_efuse.c
@@ -142,9 +142,9 @@ Efuse_PowerSwitch(
  *---------------------------------------------------------------------------*/
 u16
 Efuse_GetCurrentSize(
-	IN PADAPTER		pAdapter,
-	IN u8			efuseType,
-	IN bool		bPseudoTest)
+	PADAPTER		pAdapter,
+	u8			efuseType,
+	bool		bPseudoTest)
 {
 	u16 ret=0;
 
@@ -155,7 +155,7 @@ Efuse_GetCurrentSize(
 
 /*  11/16/2008 MH Add description. Get current efuse area enabled word!!. */
 u8
-Efuse_CalculateWordCnts(IN u8	word_en)
+Efuse_CalculateWordCnts(u8	word_en)
 {
 	u8 word_cnts = 0;
 	if (!(word_en & BIT(0)))	word_cnts++; // 0 : write enable
@@ -181,7 +181,7 @@ ReadEFuseByte(
 		PADAPTER	Adapter,
 		u16			_offset,
 		u8			*pbuf,
-		IN bool	bPseudoTest)
+		bool	bPseudoTest)
 {
 	u32	value32;
 	u8	readbyte;
@@ -1083,9 +1083,9 @@ efuse_ShadowWrite4Byte(
  *
  *---------------------------------------------------------------------------*/
 void EFUSE_ShadowMapUpdate(
-	IN PADAPTER	pAdapter,
-	IN u8		efuseType,
-	IN bool	bPseudoTest)
+	PADAPTER	pAdapter,
+	u8		efuseType,
+	bool	bPseudoTest)
 {
 	EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 	u16	mapLen=0;
diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index f069db0..c2d3cf2 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -8468,11 +8468,8 @@ Following are some utitity fuctions for WiFi MLME
 
 *****************************************************************************/
 
-bool IsLegal5GChannel(
-	IN PADAPTER			Adapter,
-	IN u8			channel)
+bool IsLegal5GChannel(PADAPTER Adapter, u8 channel)
 {
-
 	int i=0;
 	u8 Channel_5G[45] = {36,38,40,42,44,46,48,50,52,54,56,58,
 		60,62,64,100,102,104,106,108,110,112,114,116,118,120,122,
diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c
index c65fc5b..4e84d5d 100644
--- a/core/rtw_pwrctrl.c
+++ b/core/rtw_pwrctrl.c
@@ -772,14 +772,13 @@ _func_exit_;
 // Description: Leave all power save mode: LPS, FwLPS, IPS if needed.
 // Move code to function by tynli. 2010.03.26.
 //
-void LeaveAllPowerSaveMode(IN PADAPTER Adapter)
+void LeaveAllPowerSaveMode(PADAPTER Adapter)
 {
 	struct mlme_priv	*pmlmepriv = &(Adapter->mlmepriv);
 	u8	enqueue = 0;
 
 _func_enter_;
 
-	//DBG_88E("%s.....\n",__func__);
 	if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
 	{ //connect
 #ifdef CONFIG_LPS_LCLK
diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c
index 20b0ad7..9d25dd0 100644
--- a/core/rtw_wlan_util.c
+++ b/core/rtw_wlan_util.c
@@ -309,32 +309,26 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
 	_rtw_memcpy(pbssrate, supportedrates, *bssrate_len);
 }
 
-void UpdateBrateTbl(
-	IN PADAPTER		Adapter,
-	IN u8			*mBratesOS
-)
+void UpdateBrateTbl(PADAPTER Adapter, u8 *mBratesOS)
 {
 	u8	i;
 	u8	rate;
 
 	// 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory.
-	for (i=0;i<NDIS_802_11_LENGTH_RATES_EX;i++)
-	{
+	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
 		rate = mBratesOS[i] & 0x7f;
-		switch (rate)
-		{
-			case IEEE80211_CCK_RATE_1MB:
-			case IEEE80211_CCK_RATE_2MB:
-			case IEEE80211_CCK_RATE_5MB:
-			case IEEE80211_CCK_RATE_11MB:
-			case IEEE80211_OFDM_RATE_6MB:
-			case IEEE80211_OFDM_RATE_12MB:
-			case IEEE80211_OFDM_RATE_24MB:
-				mBratesOS[i] |= IEEE80211_BASIC_RATE_MASK;
-				break;
+		switch (rate) {
+		case IEEE80211_CCK_RATE_1MB:
+		case IEEE80211_CCK_RATE_2MB:
+		case IEEE80211_CCK_RATE_5MB:
+		case IEEE80211_CCK_RATE_11MB:
+		case IEEE80211_OFDM_RATE_6MB:
+		case IEEE80211_OFDM_RATE_12MB:
+		case IEEE80211_OFDM_RATE_24MB:
+			mBratesOS[i] |= IEEE80211_BASIC_RATE_MASK;
+			break;
 		}
 	}
-
 }
 
 void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c
index 647279b..8607374 100644
--- a/hal/Hal8188ERateAdaptive.c
+++ b/hal/Hal8188ERateAdaptive.c
@@ -314,7 +314,7 @@ RateUpfinish:
 	return 0;
 }
 
-static void odm_ResetRaCounter_8188E( IN PODM_RA_INFO_T  pRaInfo){
+static void odm_ResetRaCounter_8188E(PODM_RA_INFO_T  pRaInfo){
 	u1Byte RateID;
 	RateID=pRaInfo->DecisionRate;
 	pRaInfo->NscUp=(N_THRESHOLD_HIGH[RateID]+N_THRESHOLD_LOW[RateID])>>1;
@@ -731,7 +731,7 @@ ODM_RAInfo_Init(
 
 int
 ODM_RAInfo_Init_all(
-	IN    PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 	)
 {
 	u1Byte MacID = 0;
@@ -792,11 +792,11 @@ ODM_RA_GetHwPwrStatus_8188E(
 
 void
 ODM_RA_UpdateRateInfo_8188E(
-	IN PDM_ODM_T pDM_Odm,
-	IN u1Byte MacID,
-	IN u1Byte RateID,
-	IN u4Byte RateMask,
-	IN u1Byte SGIEnable
+	PDM_ODM_T pDM_Odm,
+	u1Byte MacID,
+	u1Byte RateID,
+	u4Byte RateMask,
+	u1Byte SGIEnable
 	)
 {
 	PODM_RA_INFO_T pRaInfo = NULL;
@@ -1009,7 +1009,7 @@ ODM_RAInfo_Init(
 
 int
 ODM_RAInfo_Init_all(
-	IN    PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 	)
 {
 	return 0;
@@ -1043,11 +1043,11 @@ ODM_RA_GetHwPwrStatus_8188E(
 
 void
 ODM_RA_UpdateRateInfo_8188E(
-	IN PDM_ODM_T pDM_Odm,
-	IN u1Byte MacID,
-	IN u1Byte RateID,
-	IN u4Byte RateMask,
-	IN u1Byte SGIEnable
+	PDM_ODM_T pDM_Odm,
+	u1Byte MacID,
+	u1Byte RateID,
+	u4Byte RateMask,
+	u1Byte SGIEnable
 	)
 {
 	return;
diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c
index b0bb0de..df53dfc 100644
--- a/hal/HalHWImg8188E_BB.c
+++ b/hal/HalHWImg8188E_BB.c
@@ -193,7 +193,7 @@ u4Byte Array_AGC_TAB_1T_8188E[] = {
 
 HAL_STATUS
 ODM_ReadAndConfig_AGC_TAB_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 	)
 {
 	#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
@@ -524,7 +524,7 @@ u4Byte Array_PHY_REG_1T_8188E[] = {
 
 HAL_STATUS
 ODM_ReadAndConfig_PHY_REG_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 	)
 {
 	#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
@@ -831,7 +831,7 @@ u4Byte Array_PHY_REG_PG_8188E[] = {
 
 void
 ODM_ReadAndConfig_PHY_REG_PG_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 	)
 {
 	u4Byte     hex = 0;
diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c
index 645f6a6..e2c3ef2 100644
--- a/hal/HalHWImg8188E_MAC.c
+++ b/hal/HalHWImg8188E_MAC.c
@@ -153,7 +153,7 @@ u4Byte Array_MAC_REG_8188E[] = {
 
 HAL_STATUS
 ODM_ReadAndConfig_MAC_REG_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 	)
 {
 	#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c
index 0f2a88d..feda847 100644
--- a/hal/HalHWImg8188E_RF.c
+++ b/hal/HalHWImg8188E_RF.c
@@ -162,10 +162,7 @@ u4Byte Array_RadioA_1T_8188E[] = {
 		0x000, 0x00033E60,
 };
 
-HAL_STATUS
-ODM_ReadAndConfig_RadioA_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
-	)
+HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T  pDM_Odm)
 {
 	#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
 
diff --git a/hal/HalPhyRf.c b/hal/HalPhyRf.c
index 9cabae4..16e23ba 100644
--- a/hal/HalPhyRf.c
+++ b/hal/HalPhyRf.c
@@ -179,10 +179,10 @@ phy_PathB_IQK_8192C(
 void
 phy_PathAFillIQKMatrix(
 		PADAPTER	pAdapter,
-	IN  bool	bIQKOK,
+	bool	bIQKOK,
 		s4Byte		result[][8],
 		u1Byte		final_candidate,
-	IN  bool		bTxOnly
+	bool		bTxOnly
 	)
 {
 	u4Byte	Oldval_0, X, TX0_A, reg;
@@ -246,7 +246,7 @@ phy_PathAFillIQKMatrix(
 void
 phy_PathBFillIQKMatrix(
 		PADAPTER	pAdapter,
-	IN  bool	bIQKOK,
+	bool	bIQKOK,
 		s4Byte		result[][8],
 		u1Byte		final_candidate,
 		bool		bTxOnly			//do Tx only
@@ -1498,7 +1498,7 @@ PHY_APCalibrate_8192C(
 
 void
 ODM_ResetIQKResult(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 )
 {
 	u1Byte		i;
diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c
index e416687..3870fe7 100644
--- a/hal/HalPhyRf_8188e.c
+++ b/hal/HalPhyRf_8188e.c
@@ -155,9 +155,9 @@ odm_TxPwrTrackSetPwr88E(
 void
 odm_TXPowerTrackingCallback_ThermalMeter_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
-	IN PADAPTER	Adapter
+	PADAPTER	Adapter
 #endif
 	)
 {
@@ -630,7 +630,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
 u1Byte			//bit0 = 1 => Tx OK, bit1 = 1 => Rx OK
 phy_PathA_IQK_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -694,7 +694,7 @@ phy_PathA_IQK_8188E(
 u1Byte			//bit0 = 1 => Tx OK, bit1 = 1 => Rx OK
 phy_PathA_RxIQK(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -839,7 +839,7 @@ phy_PathA_RxIQK(
 u1Byte				//bit0 = 1 => Tx OK, bit1 = 1 => Rx OK
 phy_PathB_IQK_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
 		PADAPTER	pAdapter
 #endif
@@ -902,14 +902,14 @@ phy_PathB_IQK_8188E(
 void
 _PHY_PathAFillIQKMatrix(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
-	IN  bool	bIQKOK,
+	bool	bIQKOK,
 		s4Byte		result[][8],
 		u1Byte		final_candidate,
-	IN  bool		bTxOnly
+	bool		bTxOnly
 	)
 {
 	u4Byte	Oldval_0, X, TX0_A, reg;
@@ -977,11 +977,11 @@ _PHY_PathAFillIQKMatrix(
 void
 _PHY_PathBFillIQKMatrix(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
-	IN  bool	bIQKOK,
+	bool	bIQKOK,
 		s4Byte		result[][8],
 		u1Byte		final_candidate,
 		bool		bTxOnly			//do Tx only
@@ -1081,7 +1081,7 @@ ODM_CheckPowerStatus(
 void
 _PHY_SaveADDARegisters(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1114,7 +1114,7 @@ _PHY_SaveADDARegisters(
 void
 _PHY_SaveMACRegisters(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1144,7 +1144,7 @@ _PHY_SaveMACRegisters(
 void
 _PHY_ReloadADDARegisters(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1174,7 +1174,7 @@ _PHY_ReloadADDARegisters(
 void
 _PHY_ReloadMACRegisters(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1203,7 +1203,7 @@ _PHY_ReloadMACRegisters(
 void
 _PHY_PathADDAOn(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1243,7 +1243,7 @@ _PHY_PathADDAOn(
 void
 _PHY_MACSettingCalibration(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1275,9 +1275,9 @@ _PHY_MACSettingCalibration(
 void
 _PHY_PathAStandBy(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
-	IN PADAPTER	pAdapter
+	PADAPTER	pAdapter
 #endif
 	)
 {
@@ -1300,7 +1300,7 @@ _PHY_PathAStandBy(
 void
 _PHY_PIModeSwitch(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1327,7 +1327,7 @@ _PHY_PIModeSwitch(
 bool
 phy_SimularityCompare_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1462,7 +1462,7 @@ phy_SimularityCompare_8188E(
 void
 phy_IQCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1742,7 +1742,7 @@ else
 void
 phy_LCCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -1833,7 +1833,7 @@ phy_LCCalibrate_8188E(
 void
 phy_APCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -2326,7 +2326,7 @@ if (*(pDM_Odm->mp_mode) != 1)
 void
 PHY_IQCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -2592,7 +2592,7 @@ if (*(pDM_Odm->mp_mode) == 1)
 void
 PHY_LCCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
 		PADAPTER	pAdapter
 #endif
@@ -2681,7 +2681,7 @@ if (*(pDM_Odm->mp_mode) == 1)
 void
 PHY_APCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -2731,7 +2731,7 @@ PHY_APCalibrate_8188E(
 }
 void phy_SetRFPathSwitch_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -2780,7 +2780,7 @@ void phy_SetRFPathSwitch_8188E(
 }
 void PHY_SetRFPathSwitch_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -2826,7 +2826,7 @@ phy_DigitalPredistortion(
 #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
 		PADAPTER	pAdapter,
 #else
-	IN PDM_ODM_T	pDM_Odm,
+	PDM_ODM_T	pDM_Odm,
 #endif
 		bool		is2T
 	)
@@ -3261,7 +3261,7 @@ PHY_DigitalPredistortion_8188E(
 #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
 		PADAPTER	pAdapter
 #else
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 #endif
 	)
 {
@@ -3301,7 +3301,7 @@ PHY_DigitalPredistortion_8188E(
 
 bool phy_QueryRFPathSwitch_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -3347,7 +3347,7 @@ bool phy_QueryRFPathSwitch_8188E(
 //return value TRUE => Main; FALSE => Aux
 bool PHY_QueryRFPathSwitch_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
 		PADAPTER	pAdapter
 #endif
diff --git a/hal/hal_com.c b/hal/hal_com.c
index 8d4d2d0..91e02dd 100644
--- a/hal/hal_com.c
+++ b/hal/hal_com.c
@@ -154,33 +154,54 @@ u8	MRateToHwRate(u8 rate)
 }
 
 void	HalSetBrateCfg(
-	IN PADAPTER		Adapter,
-	IN u8			*mBratesOS,
-	OUT u16			*pBrateCfg)
+	PADAPTER		Adapter,
+	u8			*mBratesOS,
+	u16			*pBrateCfg)
 {
 	u8	i, is_brate, brate;
 
-	for (i=0;i<NDIS_802_11_LENGTH_RATES_EX;i++)
-	{
+	for (i=0;i<NDIS_802_11_LENGTH_RATES_EX;i++) {
 		is_brate = mBratesOS[i] & IEEE80211_BASIC_RATE_MASK;
 		brate = mBratesOS[i] & 0x7f;
 
-		if ( is_brate )
-		{
-			switch (brate)
-			{
-				case IEEE80211_CCK_RATE_1MB:	*pBrateCfg |= RATE_1M;	break;
-				case IEEE80211_CCK_RATE_2MB:	*pBrateCfg |= RATE_2M;	break;
-				case IEEE80211_CCK_RATE_5MB:	*pBrateCfg |= RATE_5_5M;break;
-				case IEEE80211_CCK_RATE_11MB:	*pBrateCfg |= RATE_11M;	break;
-				case IEEE80211_OFDM_RATE_6MB:	*pBrateCfg |= RATE_6M;	break;
-				case IEEE80211_OFDM_RATE_9MB:	*pBrateCfg |= RATE_9M;	break;
-				case IEEE80211_OFDM_RATE_12MB:	*pBrateCfg |= RATE_12M;	break;
-				case IEEE80211_OFDM_RATE_18MB:	*pBrateCfg |= RATE_18M;	break;
-				case IEEE80211_OFDM_RATE_24MB:	*pBrateCfg |= RATE_24M;	break;
-				case IEEE80211_OFDM_RATE_36MB:	*pBrateCfg |= RATE_36M;	break;
-				case IEEE80211_OFDM_RATE_48MB:	*pBrateCfg |= RATE_48M;	break;
-				case IEEE80211_OFDM_RATE_54MB:	*pBrateCfg |= RATE_54M;	break;
+		if ( is_brate ) {
+			switch (brate) {
+			case IEEE80211_CCK_RATE_1MB:
+				*pBrateCfg |= RATE_1M;
+				break;
+			case IEEE80211_CCK_RATE_2MB:
+				*pBrateCfg |= RATE_2M;
+				break;
+			case IEEE80211_CCK_RATE_5MB:
+				*pBrateCfg |= RATE_5_5M;
+				break;
+			case IEEE80211_CCK_RATE_11MB:
+				*pBrateCfg |= RATE_11M;
+				break;
+			case IEEE80211_OFDM_RATE_6MB:
+				*pBrateCfg |= RATE_6M;
+				break;
+			case IEEE80211_OFDM_RATE_9MB:
+				*pBrateCfg |= RATE_9M;
+				break;
+			case IEEE80211_OFDM_RATE_12MB:
+				*pBrateCfg |= RATE_12M;
+				break;
+			case IEEE80211_OFDM_RATE_18MB:
+				*pBrateCfg |= RATE_18M;
+				break;
+			case IEEE80211_OFDM_RATE_24MB:
+				*pBrateCfg |= RATE_24M;
+				break;
+			case IEEE80211_OFDM_RATE_36MB:
+				*pBrateCfg |= RATE_36M;
+				break;
+			case IEEE80211_OFDM_RATE_48MB:
+				*pBrateCfg |= RATE_48M;
+				break;
+			case IEEE80211_OFDM_RATE_54MB:
+				*pBrateCfg |= RATE_54M;
+				break;
 			}
 		}
 	}
diff --git a/hal/odm.c b/hal/odm.c
index 4106e70..b7717a8 100644
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -372,7 +372,7 @@ odm_CCKTXPathDiversityCallback(
 
 void
 odm_CCKTXPathDiversityWorkItemCallback(
-    IN void *            pContext
+    void *            pContext
     );
 
 void
@@ -382,7 +382,7 @@ odm_PathDivChkAntSwitchCallback(
 
 void
 odm_PathDivChkAntSwitchWorkitemCallback(
-    IN void *            pContext
+    void *            pContext
     );
 
 void	odm_SetRespPath_92C(			PADAPTER	Adapter,		u1Byte	DefaultRespPath);
@@ -397,7 +397,7 @@ void	odm_Write_RXHP(		PDM_ODM_T	pDM_Odm);
 
 void	odm_PSD_RXHP(			PDM_ODM_T	pDM_Odm);
 void	odm_PSD_RXHPCallback(	PRT_TIMER		pTimer);
-void	odm_PSD_RXHPWorkitemCallback(	IN void *            pContext);
+void	odm_PSD_RXHPWorkitemCallback(void *            pContext);
 //End--------------------- RX High Power -----------------------//
 
 void
@@ -531,7 +531,7 @@ odm_SwAntDivChkAntSwitchCallback(
 );
 void
 odm_SwAntDivChkAntSwitchWorkitemCallback(
-    IN void *            pContext
+    void *            pContext
     );
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
@@ -604,17 +604,17 @@ ODM_RateAdaptiveStateApInit(
 
 void
 odm_TXPowerTrackingCallbackThermalMeter92C(
-            IN PADAPTER	Adapter
+            PADAPTER	Adapter
             );
 
 void
 odm_TXPowerTrackingCallbackRXGainThermalMeter92D(
-	IN PADAPTER	Adapter
+	PADAPTER	Adapter
 	);
 
 void
 odm_TXPowerTrackingCallbackThermalMeter92D(
-            IN PADAPTER	Adapter
+            PADAPTER	Adapter
             );
 
 void
@@ -690,24 +690,24 @@ odm_EdcaParaInit(
 
 void
 odm_InitHybridAntDiv(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	);
 
 bool
 odm_StaDefAntSel(
-	IN PDM_ODM_T	pDM_Odm,
-	IN u4Byte		OFDM_Ant1_Cnt,
-	IN u4Byte		OFDM_Ant2_Cnt,
-	IN u4Byte		CCK_Ant1_Cnt,
-	IN u4Byte		CCK_Ant2_Cnt,
-	OUT u1Byte		*pDefAnt
+	PDM_ODM_T	pDM_Odm,
+	u4Byte		OFDM_Ant1_Cnt,
+	u4Byte		OFDM_Ant2_Cnt,
+	u4Byte		CCK_Ant1_Cnt,
+	u4Byte		CCK_Ant2_Cnt,
+	u1Byte		*pDefAnt
 	);
 
 void
 odm_SetRxIdleAnt(
 		PDM_ODM_T	pDM_Odm,
 		u1Byte	Ant,
-	IN   bool   bDualPath
+	bool   bDualPath
 );
 
 
@@ -1345,7 +1345,7 @@ odm_CmnInfoUpdate_Debug(
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
 void
-ODM_InitAllWorkItems(IN PDM_ODM_T	pDM_Odm )
+ODM_InitAllWorkItems(PDM_ODM_T	pDM_Odm )
 {
 #if USE_WORKITEM
 	PADAPTER		pAdapter = pDM_Odm->Adapter;
@@ -1390,7 +1390,7 @@ ODM_InitAllWorkItems(IN PDM_ODM_T	pDM_Odm )
 }
 
 void
-ODM_FreeAllWorkItems(IN PDM_ODM_T	pDM_Odm )
+ODM_FreeAllWorkItems(PDM_ODM_T	pDM_Odm )
 {
 #if USE_WORKITEM
 	ODM_FreeWorkItem(	&(pDM_Odm->DM_SWAT_Table.SwAntennaSwitchWorkitem));
@@ -4304,7 +4304,7 @@ odm_RSSIMonitorCheckAP(
 
 void
 ODM_InitAllTimers(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 	ODM_InitializeTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer,
@@ -4339,7 +4339,7 @@ ODM_InitAllTimers(
 
 void
 ODM_CancelAllTimers(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
@@ -4373,7 +4373,7 @@ ODM_CancelAllTimers(
 
 void
 ODM_ReleaseAllTimers(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 	ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer);
@@ -4767,7 +4767,7 @@ ODM_SwAntDivResetBeforeLink(
 //
 void
 ODM_SwAntDivRestAfterLink(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 	pSWAT_T		pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
@@ -4782,9 +4782,9 @@ ODM_SwAntDivRestAfterLink(
 
 void
 ODM_SwAntDivChkPerPktRssi(
-	IN PDM_ODM_T	pDM_Odm,
-	IN u1Byte		StationID,
-	IN PODM_PHY_INFO_T pPhyInfo
+	PDM_ODM_T	pDM_Odm,
+	u1Byte		StationID,
+	PODM_PHY_INFO_T pPhyInfo
 	)
 {
 	SWAT_T		*pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
@@ -5434,7 +5434,7 @@ odm_SwAntDivChkAntSwitchCallback(
 }
 void
 odm_SwAntDivChkAntSwitchWorkitemCallback(
-    IN void *            pContext
+    void *            pContext
     )
 {
 
@@ -5465,9 +5465,9 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext)
 
 void odm_SwAntDivInit(			PDM_ODM_T		pDM_Odm	) {}
 void ODM_SwAntDivChkPerPktRssi(
-	IN PDM_ODM_T	pDM_Odm,
-	IN u1Byte		StationID,
-	IN PODM_PHY_INFO_T pPhyInfo
+	PDM_ODM_T	pDM_Odm,
+	u1Byte		StationID,
+	PODM_PHY_INFO_T pPhyInfo
 	) {}
 void odm_SwAntDivChkAntSwitch(
 			PDM_ODM_T		pDM_Odm,
@@ -5485,7 +5485,7 @@ odm_SwAntDivConsructChkScanChnl(
 #endif
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
 void odm_SwAntDivChkAntSwitchCallback(	PRT_TIMER		pTimer){}
-void odm_SwAntDivChkAntSwitchWorkitemCallback(    IN void *            pContext    ){}
+void odm_SwAntDivChkAntSwitchWorkitemCallback(void *            pContext    ){}
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){}
 #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
@@ -5722,7 +5722,7 @@ ODM_SwAntDivCheckBeforeLink8192C(
 #if (defined(CONFIG_HW_ANTENNA_DIVERSITY))
 void
 odm_InitHybridAntDiv_88C_92D(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 
@@ -5807,7 +5807,7 @@ odm_InitHybridAntDiv_88C_92D(
 
 void
 odm_InitHybridAntDiv(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 	)
 {
 	if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))
@@ -5834,12 +5834,12 @@ odm_InitHybridAntDiv(
 
 bool
 odm_StaDefAntSel(
-	IN PDM_ODM_T	pDM_Odm,
-	IN u4Byte		OFDM_Ant1_Cnt,
-	IN u4Byte		OFDM_Ant2_Cnt,
-	IN u4Byte		CCK_Ant1_Cnt,
-	IN u4Byte		CCK_Ant2_Cnt,
-	OUT u1Byte		*pDefAnt
+	PDM_ODM_T	pDM_Odm,
+	u4Byte		OFDM_Ant1_Cnt,
+	u4Byte		OFDM_Ant2_Cnt,
+	u4Byte		CCK_Ant1_Cnt,
+	u4Byte		CCK_Ant2_Cnt,
+	u1Byte		*pDefAnt
 
 	)
 {
@@ -5897,7 +5897,7 @@ void
 odm_SetRxIdleAnt(
 		PDM_ODM_T	pDM_Odm,
 		u1Byte	Ant,
-	IN   bool   bDualPath
+	bool   bDualPath
 )
 {
 	SWAT_T			*pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
@@ -6242,7 +6242,7 @@ ODM_Diversity_AntennaSelect(
 
 #else //#if (defined(CONFIG_HW_ANTENNA_DIVERSITY))
 
-void odm_InitHybridAntDiv(	IN PDM_ODM_T	pDM_Odm		){}
+void odm_InitHybridAntDiv(	PDM_ODM_T	pDM_Odm		){}
 void odm_HwAntDiv(		PDM_ODM_T	pDM_Odm){}
 #if (DM_ODM_SUPPORT_TYPE==ODM_MP)
 void ODM_SetTxAntByTxInfo_88C_92D(
@@ -6265,7 +6265,7 @@ void ODM_SetTxAntByTxInfo_88C_92D(			PDM_ODM_T		pDM_Odm){ }
 //============================================================
 void
 ODM_EdcaTurboInit(
-	IN    PDM_ODM_T		pDM_Odm)
+	PDM_ODM_T		pDM_Odm)
 {
 
 #if ((DM_ODM_SUPPORT_TYPE == ODM_AP)||(DM_ODM_SUPPORT_TYPE==ODM_ADSL))
@@ -7739,7 +7739,7 @@ ODM_CheckPowerStatus(
 #if ((DM_ODM_SUPPORT_TYPE == ODM_MP)||(DM_ODM_SUPPORT_TYPE == ODM_CE))
 u4Byte
 GetPSDData(
-	IN PDM_ODM_T	pDM_Odm,
+	PDM_ODM_T	pDM_Odm,
 	unsigned int	point,
 	u1Byte initial_gain_psd)
 {
@@ -7864,7 +7864,7 @@ ConvertTo_dB(
 
 void
 odm_PSDMonitorInit(
-	IN PDM_ODM_T	pDM_Odm)
+	PDM_ODM_T	pDM_Odm)
 {
 #if (DEV_BUS_TYPE == RT_PCI_INTERFACE)|(DEV_BUS_TYPE == RT_USB_INTERFACE)
 	//HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
@@ -8712,7 +8712,7 @@ odm_PSDMonitorCallback(
 
 void
 odm_PSDMonitorWorkItemCallback(
-    IN void *            pContext
+    void *            pContext
     )
 {
 	PADAPTER	Adapter = (PADAPTER)pContext;
@@ -9482,7 +9482,7 @@ odm_PSD_RXHPCallback(
 
 void
 odm_PSD_RXHPWorkitemCallback(
-    IN void *            pContext
+    void *            pContext
     )
 {
 	PADAPTER	pAdapter = (PADAPTER)pContext;
@@ -9967,7 +9967,7 @@ odm_CCKTXPathDiversityCallback(
 
 void
 odm_CCKTXPathDiversityWorkItemCallback(
-    IN void *            pContext
+    void *            pContext
     )
 {
 	PADAPTER	Adapter = (PADAPTER)pContext;
@@ -10345,7 +10345,7 @@ odm_PathDivChkAntSwitchCallback(
 
 void
 odm_PathDivChkAntSwitchWorkitemCallback(
-    IN void *            pContext
+    void *            pContext
     )
 {
 	PADAPTER	pAdapter = (PADAPTER)pContext;
diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c
index c3fe5d6..07ef4f3 100644
--- a/hal/odm_HWConfig.c
+++ b/hal/odm_HWConfig.c
@@ -67,7 +67,7 @@ odm_QueryRxPwrPercentage(
 //
 s4Byte
 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
-	IN OUT PDM_ODM_T pDM_Odm,
+	PDM_ODM_T pDM_Odm,
 	s4Byte CurrSig
 )
 {
@@ -123,7 +123,7 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
 
 s4Byte
 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
-	IN OUT PDM_ODM_T pDM_Odm,
+	PDM_ODM_T pDM_Odm,
 	s4Byte CurrSig
 )
 {
@@ -184,8 +184,8 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
 
 s4Byte
 odm_SignalScaleMapping_92CSeries(
-	IN OUT PDM_ODM_T pDM_Odm,
-	IN s4Byte CurrSig
+	PDM_ODM_T pDM_Odm,
+	s4Byte CurrSig
 )
 {
 	s4Byte RetSig;
@@ -277,7 +277,7 @@ odm_SignalScaleMapping_92CSeries(
 }
 s4Byte
 odm_SignalScaleMapping(
-	IN OUT PDM_ODM_T pDM_Odm,
+	PDM_ODM_T pDM_Odm,
 		s4Byte CurrSig
 )
 {
@@ -302,11 +302,11 @@ odm_SignalScaleMapping(
 
 //pMgntInfo->CustomerID == RT_CID_819x_Lenovo
 static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(
-	IN PDM_ODM_T	pDM_Odm,
-	IN u1Byte		isCCKrate,
-	IN u1Byte		PWDB_ALL,
-	IN u1Byte		path,
-	IN u1Byte		RSSI
+	PDM_ODM_T	pDM_Odm,
+	u1Byte		isCCKrate,
+	u1Byte		PWDB_ALL,
+	u1Byte		path,
+	u1Byte		RSSI
 )
 {
 	u1Byte	SQ;
diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c
index 22d1c9a..9467bc3 100644
--- a/hal/odm_RTL8188E.c
+++ b/hal/odm_RTL8188E.c
@@ -277,7 +277,7 @@ ODM_AntennaDiversityInit_88E(
 
 
 void
-ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant)
+ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant)
 {
 	pFAT_T	pDM_FatTable = &pDM_Odm->DM_FatTable;
 	u4Byte	DefaultAnt, OptionalAnt;
@@ -317,7 +317,7 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant)
 
 
 static void
-odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId)
+odm_UpdateTxAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant, u4Byte MacId)
 {
 	pFAT_T	pDM_FatTable = &pDM_Odm->DM_FatTable;
 	u1Byte	TargetAnt;
@@ -1204,7 +1204,7 @@ odm_DynamicPrimaryCCA(
 }
 #else //#if (RTL8188E_SUPPORT == 1)
 void
-ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant)
+ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant)
 {
 }
 void
diff --git a/hal/odm_RegConfig8188E.c b/hal/odm_RegConfig8188E.c
index 0e5abc2..f0f1e61 100644
--- a/hal/odm_RegConfig8188E.c
+++ b/hal/odm_RegConfig8188E.c
@@ -27,7 +27,7 @@ odm_ConfigRFReg_8188E(
 		PDM_ODM_T				pDM_Odm,
 		u4Byte					Addr,
 		u4Byte					Data,
-	IN  ODM_RF_RADIO_PATH_E     RF_PATH,
+	ODM_RF_RADIO_PATH_E     RF_PATH,
 		u4Byte				    RegAddr
 	)
 {
diff --git a/hal/odm_interface.c b/hal/odm_interface.c
index d735de4..d5b6317 100644
--- a/hal/odm_interface.c
+++ b/hal/odm_interface.c
@@ -459,7 +459,7 @@ ODM_StallExecution(
 }
 
 void
-ODM_delay_ms(IN u4Byte	ms)
+ODM_delay_ms(u4Byte	ms)
 {
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
 	delay_ms(ms);
@@ -471,7 +471,7 @@ ODM_delay_ms(IN u4Byte	ms)
 }
 
 void
-ODM_delay_us(IN u4Byte	us)
+ODM_delay_us(u4Byte	us)
 {
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
 	delay_us(us);
@@ -483,7 +483,7 @@ ODM_delay_us(IN u4Byte	us)
 }
 
 void
-ODM_sleep_ms(IN u4Byte	ms)
+ODM_sleep_ms(u4Byte	ms)
 {
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
 
@@ -494,7 +494,7 @@ ODM_sleep_ms(IN u4Byte	ms)
 }
 
 void
-ODM_sleep_us(IN u4Byte	us)
+ODM_sleep_us(u4Byte	us)
 {
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
 
diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c
index 0465a60..abdf2bc 100644
--- a/hal/rtl8188e_dm.c
+++ b/hal/rtl8188e_dm.c
@@ -520,7 +520,7 @@ skip_dm:
 	return;
 }
 
-void rtl8188e_init_dm_priv(IN PADAPTER Adapter)
+void rtl8188e_init_dm_priv(PADAPTER Adapter)
 {
 	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
@@ -535,7 +535,7 @@ void rtl8188e_init_dm_priv(IN PADAPTER Adapter)
 	ODM_InitDebugSetting(podmpriv);
 }
 
-void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter)
+void rtl8188e_deinit_dm_priv(PADAPTER Adapter)
 {
 	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index a206f67..6b213f0 100644
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -1272,7 +1272,7 @@ ReadEFuseByIC(
 	u16		 _offset,
 	u16		_size_byte,
 	u8		*pbuf,
-	IN bool	bPseudoTest
+	bool	bPseudoTest
 	)
 {
 #ifdef DBG_IOL_READ_EFUSE_MAP
@@ -1331,7 +1331,7 @@ ReadEFuse_Pseudo (
 	u16		 _offset,
 	u16		_size_byte,
 	u8		*pbuf,
-	IN bool	bPseudoTest
+	bool	bPseudoTest
 	)
 {
 	Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest);
@@ -3078,16 +3078,11 @@ Hal_GetChnlGroup(
 
 	return group;
 }
-static u8
-Hal_GetChnlGroup88E(
-		u8	chnl,
-	OUT u8*	pGroup
-	)
+static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
 {
 	u8 bIn24G=true;
 
-	if (chnl<=14)
-	{
+	if (chnl<=14) {
 		bIn24G=true;
 
 		if (chnl < 3)			// Chanel 1-2
@@ -3102,13 +3097,7 @@ Hal_GetChnlGroup88E(
 			*pGroup = 4;
 		else if (chnl ==14)		// Channel 14
 			*pGroup = 5;
-		else
-		{
-			//RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 2.4 G, but Channel %d in Group not found\n",chnl));
-		}
-	}
-	else
-	{
+	} else {
 		bIn24G=false;
 
 		if (chnl <=40)
@@ -3137,21 +3126,11 @@ Hal_GetChnlGroup88E(
 			*pGroup = 10;
 		else if (chnl <=177)
 			*pGroup = 11;
-		else
-		{
-			//RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 5G, but Channel %d in Group not found\n",chnl));
-		}
-
 	}
-	//RT_TRACE(COMP_EFUSE,DBG_LOUD,("<==Hal_GetChnlGroup88E,  Channel = %d, bIn24G =%d,\n",chnl,bIn24G));
 	return bIn24G;
 }
 
-void Hal_ReadPowerSavingMode88E(
-	PADAPTER		padapter,
-		u8*			hwinfo,
-		bool			AutoLoadFail
-	)
+void Hal_ReadPowerSavingMode88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c
index b60c945..65106df 100644
--- a/hal/rtl8188e_phycfg.c
+++ b/hal/rtl8188e_phycfg.c
@@ -1432,7 +1432,7 @@ phy_ConfigBBWithPgHeaderFile(
 
 static void
 phy_BB8192C_Config_1T(
-	IN PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	//for path - B
@@ -2132,7 +2132,7 @@ phy_TxPwrIdxToDbm(
 void
 PHY_GetTxPowerLevel8188E(
 		PADAPTER		Adapter,
-	OUT u32*		powerlevel
+	u32*		powerlevel
 	)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
@@ -2168,10 +2168,10 @@ PHY_GetTxPowerLevel8188E(
 void getTxPowerIndex88E(
 		PADAPTER		Adapter,
 		u8				channel,
-	IN OUT u8*			cckPowerLevel,
-	IN OUT u8*			ofdmPowerLevel,
-	IN OUT u8*			BW20PowerLevel,
-	IN OUT u8*			BW40PowerLevel
+	u8*			cckPowerLevel,
+	u8*			ofdmPowerLevel,
+	u8*			BW20PowerLevel,
+	u8*			BW40PowerLevel
 	)
 {
 
@@ -2260,10 +2260,10 @@ void getTxPowerIndex88E(
 void phy_PowerIndexCheck88E(
 		PADAPTER	Adapter,
 		u8			channel,
-	IN OUT u8 *		cckPowerLevel,
-	IN OUT u8 *		ofdmPowerLevel,
-	IN OUT u8 *		BW20PowerLevel,
-	IN OUT u8 *		BW40PowerLevel
+	u8 *		cckPowerLevel,
+	u8 *		ofdmPowerLevel,
+	u8 *		BW20PowerLevel,
+	u8 *		BW40PowerLevel
 	)
 {
 
@@ -2711,7 +2711,7 @@ phy_SwChnlStepByStep(
 		u8		channel,
 		u8		*stage,
 		u8		*step,
-	OUT u32		*delay
+	u32		*delay
 	)
 {
 	return true;
diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c
index acf5df6..4ce18cf 100644
--- a/hal/rtl8188e_rf6052.c
+++ b/hal/rtl8188e_rf6052.c
@@ -288,8 +288,8 @@ void getPowerBase88E(
 		u8*			pPowerLevelBW20,
 		u8*			pPowerLevelBW40,
 		u8			Channel,
-	IN OUT u32*		OfdmBase,
-	IN OUT u32*		MCSBase
+	u32*		OfdmBase,
+	u32*		MCSBase
 	)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c
index 84cff6c..2b14774 100644
--- a/hal/rtl8188e_xmit.c
+++ b/hal/rtl8188e_xmit.c
@@ -130,7 +130,7 @@ struct EMInfo{
 void
 InsertEMContent_8188E(
 	struct EMInfo *pEMInfo,
-	IN pu1Byte	VirtualAddress)
+	pu1Byte	VirtualAddress)
 {
 
 #if RTL8188E_EARLY_MODE_PKT_NUM_10 == 1
diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index 47116f1..495be5a 100644
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -302,7 +302,7 @@ static void _InitBTCoexist(_adapter *padapter)
 //---------------------------------------------------------------
 static void
 _SetMacID(
-	IN  PADAPTER Adapter, u8* MacID
+	PADAPTER Adapter, u8* MacID
 	)
 {
 	u32 i;
@@ -318,7 +318,7 @@ _SetMacID(
 
 static void
 _SetBSSID(
-	IN  PADAPTER Adapter, u8* BSSID
+	PADAPTER Adapter, u8* BSSID
 	)
 {
 	u32 i;
@@ -336,7 +336,7 @@ _SetBSSID(
 // Shall USB interface init this?
 static void
 _InitInterrupt(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	u32	imr,imr_ex;
@@ -379,7 +379,7 @@ _InitInterrupt(
 
 static void
 _InitQueueReservedPage(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
@@ -428,8 +428,8 @@ _InitQueueReservedPage(
 
 static void
 _InitTxBufferBoundary(
-	IN PADAPTER Adapter,
-	IN u8 txpktbuf_bndy
+	PADAPTER Adapter,
+	u8 txpktbuf_bndy
 	)
 {
 	struct registry_priv *pregistrypriv = &Adapter->registrypriv;
@@ -447,7 +447,7 @@ _InitTxBufferBoundary(
 
 static void
 _InitPageBoundary(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	// RX Page Boundary
@@ -623,7 +623,7 @@ _InitQueuePriority(
 
 static void
 _InitHardwareDropIncorrectBulkOut(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	u32	value32 = rtw_read32(Adapter, REG_TXDMA_OFFSET_CHK);
@@ -633,7 +633,7 @@ _InitHardwareDropIncorrectBulkOut(
 
 static void
 _InitNetworkType(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	u32	value32;
@@ -648,7 +648,7 @@ _InitNetworkType(
 
 static void
 _InitTransferPageSize(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	// Tx page size is always 128.
@@ -660,7 +660,7 @@ _InitTransferPageSize(
 
 static void
 _InitDriverInfoSize(
-	IN  PADAPTER	Adapter,
+	PADAPTER	Adapter,
 		u8		drvInfoSize
 	)
 {
@@ -669,7 +669,7 @@ _InitDriverInfoSize(
 
 static void
 _InitWMACSetting(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	//u4Byte			value32;
@@ -713,7 +713,7 @@ _InitWMACSetting(
 
 static void
 _InitAdaptiveCtrl(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	u16	value16;
@@ -740,7 +740,7 @@ _InitAdaptiveCtrl(
 
 static void
 _InitRateFallback(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	// Set Data Auto Rate Fallback Retry Count register.
@@ -754,7 +754,7 @@ _InitRateFallback(
 
 static void
 _InitEDCA(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	// Set Spec SIFS (used in NAV)
@@ -777,7 +777,7 @@ _InitEDCA(
 
 static void
 _InitBeaconMaxError(
-	IN  PADAPTER	Adapter,
+	PADAPTER	Adapter,
 		bool		InfraMode
 	)
 {
@@ -821,7 +821,7 @@ _InitRxSetting(
 
 static void
 _InitRetryFunction(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	u8	value8;
@@ -977,7 +977,7 @@ usb_AggSettingRxUpdate(
 
 static void
 InitUsbAggregationSetting(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
@@ -993,8 +993,8 @@ InitUsbAggregationSetting(
 }
 void
 HalRxAggr8188EUsb(
-	IN  PADAPTER Adapter,
-	IN bool	Value
+	PADAPTER Adapter,
+	bool	Value
 	)
 {
 }
@@ -1035,7 +1035,7 @@ _InitOperationMode(
 
  static void
 _InitBeaconParameters(
-	IN  PADAPTER Adapter
+	PADAPTER Adapter
 	)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
@@ -1156,7 +1156,7 @@ _InitAntenna_Selection(	PADAPTER Adapter)
 //
 static void
 HalDetectSelectiveSuspendMode(
-	IN PADAPTER				Adapter
+	PADAPTER				Adapter
 	)
 {
 }	// HalDetectSelectiveSuspendMode
@@ -2098,7 +2098,7 @@ Hal_CustomizeByCustomerID_8188EU(
 }
 
 // Read HW power down mode selection
-static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8	AutoloadFail)
+static void _ReadPSSetting(PADAPTER Adapter, u8 *PROMContent, u8 AutoloadFail)
 {
 }
 
@@ -2271,7 +2271,7 @@ readAdapterInfo_8188EU(
 }
 
 static void _ReadPROMContent(
-	IN PADAPTER		Adapter
+	PADAPTER		Adapter
 	)
 {
 	EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h
index 4b94b9f..bfe6884 100644
--- a/include/Hal8188EPhyCfg.h
+++ b/include/Hal8188EPhyCfg.h
@@ -240,7 +240,7 @@ int	PHY_BBConfig8188E(	PADAPTER	Adapter	);
 int	PHY_RFConfig8188E(	PADAPTER	Adapter	);
 
 /* RF config */
-int	rtl8188e_PHY_ConfigRFWithParaFile(IN PADAPTER Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath);
+int	rtl8188e_PHY_ConfigRFWithParaFile(PADAPTER Adapter, u8 * pFileName, RF_RADIO_PATH_E eRFPath);
 int	rtl8188e_PHY_ConfigRFWithHeaderFile(		PADAPTER			Adapter,
 														RF_RADIO_PATH_E		eRFPath);
 
@@ -256,12 +256,9 @@ void	rtl8192c_PHY_GetHWRegOriginalValue(		PADAPTER		Adapter	);
 //
 // BB TX Power R/W
 //
-void	PHY_GetTxPowerLevel8188E(		PADAPTER		Adapter,
-											OUT u32*		powerlevel	);
-void	PHY_SetTxPowerLevel8188E(		PADAPTER		Adapter,
-												u8			channel	);
-bool	PHY_UpdateTxPowerDbm8188E(		PADAPTER	Adapter,
-												int		powerInDbm	);
+void	PHY_GetTxPowerLevel8188E(PADAPTER Adapter, u32 *powerlevel);
+void	PHY_SetTxPowerLevel8188E(PADAPTER Adapter, u8 channel);
+bool	PHY_UpdateTxPowerDbm8188E(PADAPTER Adapter, int powerInDbm);
 
 //
 void
@@ -419,7 +416,7 @@ storePwrIndexDiffRateOffset(
 #endif
 
 #if (SIC_ENABLE == 1)
-void SIC_Init(IN PADAPTER Adapter);
+void SIC_Init(PADAPTER Adapter);
 #endif
 
 
diff --git a/include/Hal8188ERateAdaptive.h b/include/Hal8188ERateAdaptive.h
index 6c1e34e..b293b8a 100644
--- a/include/Hal8188ERateAdaptive.h
+++ b/include/Hal8188ERateAdaptive.h
@@ -47,7 +47,7 @@ ODM_RASupport_Init(
 
 int
 ODM_RAInfo_Init_all(
-	IN    PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 	);
 
 int
@@ -75,11 +75,11 @@ ODM_RA_GetHwPwrStatus_8188E(
 	);
 void
 ODM_RA_UpdateRateInfo_8188E(
-	IN PDM_ODM_T pDM_Odm,
-	IN u1Byte MacID,
-	IN u1Byte RateID,
-	IN u4Byte RateMask,
-	IN u1Byte SGIEnable
+	PDM_ODM_T pDM_Odm,
+	u1Byte MacID,
+	u1Byte RateID,
+	u4Byte RateMask,
+	u1Byte SGIEnable
 	);
 
 void
diff --git a/include/HalHWImg8188E_BB.h b/include/HalHWImg8188E_BB.h
index 622bc33..3434e5c 100644
--- a/include/HalHWImg8188E_BB.h
+++ b/include/HalHWImg8188E_BB.h
@@ -30,7 +30,7 @@
 
 HAL_STATUS
 ODM_ReadAndConfig_AGC_TAB_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 );
 
 /******************************************************************************
@@ -39,7 +39,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
 
 HAL_STATUS
 ODM_ReadAndConfig_PHY_REG_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 );
 
 /******************************************************************************
@@ -48,7 +48,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
 
 void
 ODM_ReadAndConfig_PHY_REG_PG_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 );
 
 #endif
diff --git a/include/HalHWImg8188E_FW.h b/include/HalHWImg8188E_FW.h
index 917819f..3080a4b 100644
--- a/include/HalHWImg8188E_FW.h
+++ b/include/HalHWImg8188E_FW.h
@@ -27,12 +27,7 @@
 *                           FW_AP.TXT
 ******************************************************************************/
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP))
-void
-ODM_ReadFirmware_8188E_FW_AP(
-     IN   PDM_ODM_T    pDM_Odm,
-     OUT  u1Byte       *pFirmware,
-     OUT  u4Byte       *pFirmwareSize
-);
+void ODM_ReadFirmware_8188E_FW_AP(PDM_ODM_T    pDM_Odm, u1Byte *pFirmware, u4Byte *pFirmwareSize);
 
 #else
 /******************************************************************************
diff --git a/include/HalHWImg8188E_MAC.h b/include/HalHWImg8188E_MAC.h
index 1e70660..6e2c0f2 100644
--- a/include/HalHWImg8188E_MAC.h
+++ b/include/HalHWImg8188E_MAC.h
@@ -30,7 +30,7 @@
 
 HAL_STATUS
 ODM_ReadAndConfig_MAC_REG_8188E(
-	IN   PDM_ODM_T  pDM_Odm
+	PDM_ODM_T  pDM_Odm
 );
 
 #endif
diff --git a/include/HalHWImg8188E_RF.h b/include/HalHWImg8188E_RF.h
index 6f91baa..1e59cd2 100644
--- a/include/HalHWImg8188E_RF.h
+++ b/include/HalHWImg8188E_RF.h
@@ -28,10 +28,7 @@
 *                           RadioA_1T.TXT
 ******************************************************************************/
 
-HAL_STATUS
-ODM_ReadAndConfig_RadioA_1T_8188E(
-	IN   PDM_ODM_T  pDM_Odm
-);
+HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T  pDM_Odm);
 
 #endif
 #endif // end of HWIMG_SUPPORT
diff --git a/include/HalPhyRf.h b/include/HalPhyRf.h
index df224e5..2dd1f4e 100644
--- a/include/HalPhyRf.h
+++ b/include/HalPhyRf.h
@@ -58,11 +58,11 @@ PHY_APCalibrate_8192C(			PADAPTER	pAdapter,
 
 void
 ODM_ResetIQKResult(
-	IN PDM_ODM_T	pDM_Odm
+	PDM_ODM_T	pDM_Odm
 );
 u1Byte
 ODM_GetRightChnlPlaceforIQK(
-    IN u1Byte chnl
+    u1Byte chnl
 );
 
 
diff --git a/include/HalPhyRf_8188e.h b/include/HalPhyRf_8188e.h
index 56fd164..db5e545 100644
--- a/include/HalPhyRf_8188e.h
+++ b/include/HalPhyRf_8188e.h
@@ -39,9 +39,9 @@ ODM_TxPwrTrackAdjust88E(
 void
 odm_TXPowerTrackingCallback_ThermalMeter_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
-	IN PADAPTER	Adapter
+	PADAPTER	Adapter
 #endif
 	);
 
@@ -51,9 +51,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
 void
 PHY_IQCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
-	IN PADAPTER	Adapter,
+	PADAPTER	Adapter,
 #endif
 								bool		bReCovery);
 
@@ -64,7 +64,7 @@ PHY_IQCalibrate_8188E(
 void
 PHY_LCCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
 		PADAPTER	pAdapter
 #endif
@@ -76,7 +76,7 @@ PHY_LCCalibrate_8188E(
 void
 PHY_APCalibrate_8188E(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -88,7 +88,7 @@ PHY_DigitalPredistortion_8188E(			PADAPTER	pAdapter);
 void
 _PHY_SaveADDARegisters(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -100,7 +100,7 @@ _PHY_SaveADDARegisters(
 void
 _PHY_PathADDAOn(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -112,7 +112,7 @@ _PHY_PathADDAOn(
 void
 _PHY_MACSettingCalibration(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm,
+	PDM_ODM_T		pDM_Odm,
 #else
 		PADAPTER	pAdapter,
 #endif
@@ -124,7 +124,7 @@ _PHY_MACSettingCalibration(
 void
 _PHY_PathAStandBy(
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
-	IN PDM_ODM_T		pDM_Odm
+	PDM_ODM_T		pDM_Odm
 #else
 		PADAPTER	pAdapter
 #endif
diff --git a/include/basic_types.h b/include/basic_types.h
index 9bc4b5d..357e059 100644
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -27,14 +27,12 @@
 #define FAIL	(-1)
 
 #include <linux/types.h>
-#define IN
-#define OUT
 #define NDIS_OID uint
 #define NDIS_STATUS uint
 
 typedef	signed int sint;
 
-       #define UCHAR u8
+#define UCHAR u8
 #define USHORT u16
 #define UINT u32
 #define ULONG u32
diff --git a/include/hal_com.h b/include/hal_com.h
index c40d84b..ed96a5f 100644
--- a/include/hal_com.h
+++ b/include/hal_com.h
@@ -163,9 +163,9 @@ hal_com_get_channel_plan(
 u8	MRateToHwRate(u8 rate);
 
 void	HalSetBrateCfg(
-	IN PADAPTER		Adapter,
-	IN u8			*mBratesOS,
-	OUT u16			*pBrateCfg);
+	PADAPTER		Adapter,
+	u8			*mBratesOS,
+	u16			*pBrateCfg);
 
 bool
 Hal_MappingOutPipe(
diff --git a/include/odm.h b/include/odm.h
index 19c8914..bc19bd1 100644
--- a/include/odm.h
+++ b/include/odm.h
@@ -1657,11 +1657,7 @@ ODM_SwAntDivCheckBeforeLink8192C(
 #endif
 
 #define dm_SWAW_RSSI_Check	ODM_SwAntDivChkPerPktRssi
-void ODM_SwAntDivChkPerPktRssi(
-	IN PDM_ODM_T		pDM_Odm,
-	IN u1Byte			StationID,
-	IN PODM_PHY_INFO_T pPhyInfo
-	);
+void ODM_SwAntDivChkPerPktRssi(PDM_ODM_T pDM_Odm, u1Byte StationID, PODM_PHY_INFO_T pPhyInfo);
 
 #if ((DM_ODM_SUPPORT_TYPE==ODM_MP)||(DM_ODM_SUPPORT_TYPE==ODM_CE))
 
@@ -1696,7 +1692,7 @@ void	odm_PSDMonitorCallback(PRT_TIMER		pTimer);
 
 void
 odm_PSDMonitorWorkItemCallback(
-    IN void *            pContext
+    void *pContext
     );
 
 
@@ -1762,28 +1758,28 @@ ODM_CmnInfoUpdate(
 
 void
 ODM_InitAllTimers(
-    IN PDM_ODM_T	pDM_Odm
+    PDM_ODM_T	pDM_Odm
     );
 
 void
 ODM_CancelAllTimers(
-    IN PDM_ODM_T    pDM_Odm
+    PDM_ODM_T    pDM_Odm
     );
 
 void
 ODM_ReleaseAllTimers(
-    IN PDM_ODM_T	pDM_Odm
+    PDM_ODM_T	pDM_Odm
     );
 
 void
 ODM_ResetIQKResult(
-    IN PDM_ODM_T pDM_Odm
+    PDM_ODM_T pDM_Odm
     );
 
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
-void ODM_InitAllWorkItems(IN PDM_ODM_T	pDM_Odm );
-void ODM_FreeAllWorkItems(IN PDM_ODM_T	pDM_Odm );
+void ODM_InitAllWorkItems(PDM_ODM_T	pDM_Odm );
+void ODM_FreeAllWorkItems(PDM_ODM_T	pDM_Odm );
 
 void odm_PathDivChkAntSwitch(PDM_ODM_T pDM_Odm);
 void ODM_PathDivRestAfterLink(
@@ -1818,8 +1814,8 @@ void ODM_PathDivChkPerPktRssi(PADAPTER		Adapter,
 
 u8Byte
 PlatformDivision64(
-	IN u8Byte	x,
-	IN u8Byte	y
+	u8Byte	x,
+	u8Byte	y
 );
 
 
diff --git a/include/odm_RTL8188E.h b/include/odm_RTL8188E.h
index f80f316..07ab4db 100644
--- a/include/odm_RTL8188E.h
+++ b/include/odm_RTL8188E.h
@@ -65,8 +65,8 @@ ODM_SetTxAntByTxInfo_88E(
 
 void
 ODM_UpdateRxIdleAnt_88E(
-	IN PDM_ODM_T pDM_Odm,
-	IN u1Byte Ant
+	PDM_ODM_T pDM_Odm,
+	u1Byte Ant
 );
 
 void
diff --git a/include/odm_RegConfig8188E.h b/include/odm_RegConfig8188E.h
index 29b2b43..a8001f5 100644
--- a/include/odm_RegConfig8188E.h
+++ b/include/odm_RegConfig8188E.h
@@ -27,7 +27,7 @@ odm_ConfigRFReg_8188E(
 		PDM_ODM_T				pDM_Odm,
 		u4Byte					Addr,
 		u4Byte					Data,
-	IN  ODM_RF_RADIO_PATH_E     RF_PATH,
+	ODM_RF_RADIO_PATH_E     RF_PATH,
 		u4Byte				    RegAddr
 	);
 
diff --git a/include/odm_interface.h b/include/odm_interface.h
index 958e462..aa657f1 100644
--- a/include/odm_interface.h
+++ b/include/odm_interface.h
@@ -269,17 +269,17 @@ ODM_StallExecution(
 	);
 
 void
-ODM_delay_ms(IN u4Byte	ms);
+ODM_delay_ms(u4Byte	ms);
 
 
 void
-ODM_delay_us(IN u4Byte	us);
+ODM_delay_us(u4Byte	us);
 
 void
-ODM_sleep_ms(IN u4Byte	ms);
+ODM_sleep_ms(u4Byte	ms);
 
 void
-ODM_sleep_us(IN u4Byte	us);
+ODM_sleep_us(u4Byte	us);
 
 void
 ODM_SetTimer(
diff --git a/include/osdep_service.h b/include/osdep_service.h
index 6b78695..70eb5cf 100644
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -240,7 +240,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
 #ifdef PLATFORM_LINUX
 #define RTW_TIMER_HDL_ARGS void *FunctionContext
 #elif defined(PLATFORM_OS_CE) || defined(PLATFORM_WINDOWS)
-#define RTW_TIMER_HDL_ARGS IN void * SystemSpecific1, IN void * FunctionContext, IN PVOID SystemSpecific2, IN PVOID SystemSpecific3
+#define RTW_TIMER_HDL_ARGS void * SystemSpecific1, void * FunctionContext, PVOID SystemSpecific2, PVOID SystemSpecific3
 #endif
 
 #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl
diff --git a/include/recv_osdep.h b/include/recv_osdep.h
index b39e00b..3bbe3e1 100644
--- a/include/recv_osdep.h
+++ b/include/recv_osdep.h
@@ -31,7 +31,7 @@ extern void _rtw_free_recv_priv (struct recv_priv *precvpriv);
 
 extern s32  rtw_recv_entry(union recv_frame *precv_frame);
 extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame);
-extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt);
+extern void rtw_recv_returnpacket(_nic_hdl cnxt, _pkt *preturnedpkt);
 
 extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame);
 extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup);
diff --git a/include/rtl8188e_dm.h b/include/rtl8188e_dm.h
index fbd7777..19a222f 100644
--- a/include/rtl8188e_dm.h
+++ b/include/rtl8188e_dm.h
@@ -51,10 +51,10 @@ struct	dm_priv
 	u8	PowerIndex_backup[6];
 };
 
-void rtl8188e_init_dm_priv(IN PADAPTER Adapter);
-void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter);
-void rtl8188e_InitHalDm(IN PADAPTER Adapter);
-void rtl8188e_HalDmWatchDog(IN PADAPTER Adapter);
+void rtl8188e_init_dm_priv(PADAPTER Adapter);
+void rtl8188e_deinit_dm_priv(PADAPTER Adapter);
+void rtl8188e_InitHalDm(PADAPTER Adapter);
+void rtl8188e_HalDmWatchDog(PADAPTER Adapter);
 
 #ifdef CONFIG_ANTENNA_DIVERSITY
 void	AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h
index cd8910a..5ef6fb9 100644
--- a/include/rtw_ioctl.h
+++ b/include/rtw_ioctl.h
@@ -115,7 +115,7 @@ static NDIS_STATUS oid_null_function(struct oid_par_priv* poid_par_priv)
 
 #ifdef PLATFORM_WINDOWS
 
-int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE	ndisPsMode);
+int TranslateNdisPsToRtPs(NDIS_802_11_POWER_MODE	ndisPsMode);
 
 //OID Handler for Segment 1
 NDIS_STATUS oid_gen_supported_list_hdl(struct oid_par_priv* poid_par_priv);
diff --git a/include/rtw_mp.h b/include/rtw_mp.h
index 738aa50..4d7fd15 100644
--- a/include/rtw_mp.h
+++ b/include/rtw_mp.h
@@ -222,7 +222,7 @@ struct mp_tx
 
 
 
-typedef void (*MPT_WORK_ITEM_HANDLER)(IN void * Adapter);
+typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter);
 typedef struct _MPT_CONTEXT
 {
 	// Indicate if we have started Mass Production Test.
diff --git a/include/usb_vendor_req.h b/include/usb_vendor_req.h
index 34790ef..8c961e1 100644
--- a/include/usb_vendor_req.h
+++ b/include/usb_vendor_req.h
@@ -51,9 +51,4 @@ typedef enum _RT_USB_WVALUE {
 } RT_USB_WVALUE;
 
 
-//bool usbvendorrequest(PCE_USB_DEVICE	CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, void * Data, UCHAR DataLength, bool isDirectionIn);
-//bool CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, void * Data);
-//bool CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index);
-//bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN void *  TransferBuffer, IN ULONG TransferBufferLength);
-
 #endif
diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h
index a37e7f2..c5de74a 100644
--- a/include/xmit_osdep.h
+++ b/include/xmit_osdep.h
@@ -52,9 +52,9 @@ struct pkt_file {
 #define ETH_ALEN	6
 
 extern NDIS_STATUS rtw_xmit_entry(
-IN _nic_hdl		cnxt,
-IN NDIS_PACKET		*pkt,
-IN UINT				flags
+_nic_hdl		cnxt,
+NDIS_PACKET		*pkt,
+UINT				flags
 );
 
 #endif