diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index 684928a..04dc791 100644
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -1197,7 +1197,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
 		init_h2fwcmd_w_parm_no_rsp(ph2c, psetop, _SetOpMode_CMD_);
 		res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 	}
-	else{
+	else {
 		setopmode_hdl(padapter, (u8 *)psetop);
 		rtw_mfree((u8 *)psetop, sizeof(*psetop));
 	}
@@ -1232,7 +1232,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
 
 	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
 			psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
-	}else{
+	} else {
 		GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
 	}
 
@@ -1268,7 +1268,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
 		ph2c->rspsz = sizeof(struct set_stakey_rsp);
 		res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 	}
-	else{
+	else {
 		set_stakey_hdl(padapter, (u8 *)psetstakey_para);
 		rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm));
 	}
@@ -2154,7 +2154,7 @@ u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna, u8 enqueue)
 
 		res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 	}
-	else{
+	else {
 		antenna_select_wk_hdl(padapter, antenna );
 	}
 exit:
diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c
index 4d0807d..002f3ba 100644
--- a/core/rtw_ioctl_set.c
+++ b/core/rtw_ioctl_set.c
@@ -806,7 +806,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
 			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:( stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)\n"));
 			encryptionalgo =stainfo->dot118021XPrivacy;
 		}
-		else{
+		else {
 			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: stainfo == NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!=dot11AuthAlgrthm_8021X)\n"));
 			encryptionalgo =padapter->securitypriv.dot11PrivacyAlgrthm;
 		}
@@ -1114,7 +1114,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
 				res =rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false, true);
 				RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n"));
 			}
-			else{
+			else {
 				res =rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true, true);
 				RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n"));
 			}
@@ -1168,7 +1168,7 @@ u8 rtw_set_802_11_remove_key(struct adapter*	padapter, struct ndis_802_11_remove
 			memset(&stainfo->dot118021x_UncstKey, 0, 16);
 
 			/*  \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */
-		} else{
+		} else {
 			ret = _FAIL;
 			goto exit;
 		}
diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index 65d44f7..5106456 100644
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -2430,7 +2430,7 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
 		psetkeyparm->algorithm =(unsigned char)psecuritypriv->dot118021XGrpPrivacy;
 		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(unsigned char)psecuritypriv->dot118021XGrpPrivacy =%d\n", psetkeyparm->algorithm));
 	}
-	else{
+	else {
 		psetkeyparm->algorithm =(u8)psecuritypriv->dot11PrivacyAlgrthm;
 		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(u8)psecuritypriv->dot11PrivacyAlgrthm =%d\n", psetkeyparm->algorithm));
 
@@ -2491,7 +2491,7 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
 
 		res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 	}
-	else{
+	else {
 		setkey_hdl(adapter, (u8 *)psetkeyparm);
 		rtw_mfree((u8 *) psetkeyparm, sizeof(struct setkey_parm));
 	}
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 1eb227c..712814d 100644
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -419,7 +419,7 @@ sint recvframe_chkmic(struct adapter *adapter,  union recv_frame *precvframe) {
 					goto exit;
 				}
 			}
-			else{
+			else {
 				mickey =&stainfo->dot11tkiprxmickey.skey[0];
 				RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic: unicast key\n"));
 			}
@@ -489,7 +489,7 @@ sint recvframe_chkmic(struct adapter *adapter,  union recv_frame *precvframe) {
 				res =_FAIL;
 
 			}
-			else{
+			else {
 				/* mic checked ok */
 				if ((psecuritypriv->bcheck_grpkey ==false)&&(IS_MCAST(prxattrib->ra) ==true)) {
 					psecuritypriv->bcheck_grpkey =true;
@@ -594,7 +594,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
 		return_packet = NULL;
 
 	}
-	else{
+	else {
 		prxattrib->bdecrypted = true;
 	}
 	return return_packet;
@@ -675,7 +675,7 @@ static union recv_frame * portctrl(struct adapter *adapter, union recv_frame * p
 
 				prtnframe =precv_frame;
 			}
-			else{
+			else {
 				RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:ether_type =0x%04x\n", ether_type));
 			}
 		}
diff --git a/core/rtw_security.c b/core/rtw_security.c
index 86ec02b..f6612b5 100644
--- a/core/rtw_security.c
+++ b/core/rtw_security.c
@@ -112,7 +112,7 @@ static void crc32_init(void)
 ;
 	if (bcrc32initialized == 1)
 		goto exit;
-	else{
+	else {
 		sint i, j;
 		u32 c;
 		u8 *p =(u8 *)&c, *p1;
@@ -396,7 +396,7 @@ void rtw_seccalctkipmic(u8 * key, u8 *header, u8 *data, u32 data_len, u8 *mic_co
 			rtw_secmicappend(&micdata, &header[24], 6);
 		else
 			rtw_secmicappend(&micdata, &header[10], 6);
-	} else{	/* ToDS == 0 */
+	} else {	/* ToDS == 0 */
 		rtw_secmicappend(&micdata, &header[4], 6);   /* DA */
 		if (header[1]&2)  /* From Ds ==1 */
 			rtw_secmicappend(&micdata, &header[16], 6);
@@ -709,7 +709,7 @@ u32	rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
 					arcfour_encrypt(&mycontext, payload, payload, length);
 					arcfour_encrypt(&mycontext, payload+length, crc, 4);
 
-				} else{
+				} else {
 					length =pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ;
 					*((__le32 *)crc) =getcrc32(payload, length);/* modified by Amy*/
 					arcfour_init(&mycontext, rc4key, 16);
@@ -724,7 +724,7 @@ u32	rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
 
 		}
-		else{
+		else {
 			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo == NULL!!!\n"));
 	                DBG_871X("%s, psta ==NUL\n", __func__);
 			res =_FAIL;
@@ -845,7 +845,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
 
 
 		}
-		else{
+		else {
 			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo == NULL!!!\n"));
 			res =_FAIL;
 		}
@@ -1588,7 +1588,7 @@ u32	rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
 					pframe =(u8*)RND4((SIZE_PTR)(pframe));
 				}
 			}
-		} else{
+		} else {
 			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo == NULL!!!\n"));
 	                DBG_871X("%s, psta ==NUL\n", __func__);
 			res =_FAIL;
diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c
index 3069752..7c0626e 100644
--- a/core/rtw_wlan_util.c
+++ b/core/rtw_wlan_util.c
@@ -2107,7 +2107,7 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init)
 			pbuddy_padapter = NULL;
 			DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__);
 		}
-	}else {
+	} else {
 		pbuddy_padapter = NULL;
 	}
 exit:
diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index 0c10c9c..03b606f 100644
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -902,7 +902,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 					rtw_secmicappend(&micdata, &pframe[24], 6);
 				else
 				rtw_secmicappend(&micdata, &pframe[10], 6);
-			} else{	/* ToDS == 0 */
+			} else {	/* ToDS == 0 */
 				rtw_secmicappend(&micdata, &pframe[4], 6);   /* DA */
 				if (pframe[1]&2)  /* From Ds ==1 */
 					rtw_secmicappend(&micdata, &pframe[16], 6);
@@ -932,7 +932,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 					rtw_secmicappend(&micdata, payload, length);
 					payload =payload+length;
 				}
-				else{
+				else {
 					length =pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-( (pattrib->bswenc) ? pattrib->icv_len : 0);
 					rtw_secmicappend(&micdata, payload, length);
 					payload =payload+length+pattrib->icv_len;
@@ -957,7 +957,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 					*(payload+curfragnum), *(payload+curfragnum+1), *(payload+curfragnum+2),*(payload+curfragnum+3),
 					*(payload+curfragnum+4),*(payload+curfragnum+5),*(payload+curfragnum+6),*(payload+curfragnum+7)));
 			}
-			else{
+			else {
 				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: rtw_get_stainfo == NULL!!!\n"));
 			}
 	}
diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c
index d40c57f..ae52ca1 100644
--- a/hal/Hal8188ERateAdaptive.c
+++ b/hal/Hal8188ERateAdaptive.c
@@ -188,7 +188,7 @@ RateDownFinish:
 	}
 	else if (pRaInfo->RAWaitingCounter== 0) {
 	}
-	else{
+	else {
 		pRaInfo->RAWaitingCounter=0;
 		pRaInfo->RAPendingCounter=0;
 	}
@@ -434,7 +434,7 @@ odm_ARFBRefresh_8188E(
 			}
 		}
 	}
-	else{
+	else {
 		pRaInfo->HighestRate=0;
 	}
 	/*  Lowest rate */
@@ -448,7 +448,7 @@ odm_ARFBRefresh_8188E(
 			}
 		}
 	}
-	else{
+	else {
 		pRaInfo->LowestRate=0;
 	}
 
@@ -524,12 +524,12 @@ odm_PTTryState_8188E(
 			pRaInfo->PTStopCount=0;
 
 		}
-		else{
+		else {
 			pRaInfo->RAstage=0;
 			pRaInfo->PTStopCount++;
 		}
 	}
-	else{
+	else {
 		pRaInfo->PTStage=0;
 		pRaInfo->RAstage=0;
 	}
@@ -871,7 +871,7 @@ ODM_RA_TxRPT2Handle_8188E(
 					else
 						pRAInfo->RAstage=0;
 				}
-				else{
+				else {
 					odm_RateDecision_8188E(pDM_Odm,pRAInfo);
 				}
 #else
diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c
index f0632ee..b68025c 100644
--- a/hal/HalPhyRf_8188e.c
+++ b/hal/HalPhyRf_8188e.c
@@ -1026,7 +1026,7 @@ _PHY_PathADDAOn(
 		pathOn = 0x0bdb25a0;
 		ODM_SetBBReg(pDM_Odm, ADDAReg[0], bMaskDWord, 0x0b1b25a0);
 	}
-	else{
+	else {
 		ODM_SetBBReg(pDM_Odm,ADDAReg[0], bMaskDWord, pathOn);
 	}
 
diff --git a/hal/hal_com.c b/hal/hal_com.c
index e1a1f41..d8811f9 100644
--- a/hal/hal_com.c
+++ b/hal/hal_com.c
@@ -215,7 +215,7 @@ _TwoOutPipeMapping(
 		pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */
 
 	}
-	else{/* typical setting */
+	else {/* typical setting */
 
 
 		/* BK,	BE,	VI,	VO,	BCN,	CMD,MGT,HIGH,HCCA */
@@ -260,7 +260,7 @@ static void _ThreeOutPipeMapping(
 		pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */
 
 	}
-	else{/* typical setting */
+	else {/* typical setting */
 
 
 		/* 	BK,	BE,	VI,	VO,	BCN,	CMD,MGT,HIGH,HCCA */
diff --git a/hal/hal_intf.c b/hal/hal_intf.c
index 5f98b72..76c15cc 100644
--- a/hal/hal_intf.c
+++ b/hal/hal_intf.c
@@ -119,7 +119,7 @@ uint	 rtw_hal_init(struct adapter *padapter)
 
 		init_hw_mlme_ext(padapter);
 	}
-	else{
+	else {
 		for (i = 0; i<dvobj->iface_nums; i++) {
 			padapter = dvobj->padapters[i];
 			padapter->hw_init_completed = false;
diff --git a/hal/odm.c b/hal/odm.c
index de206d4..7035e87 100644
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -1588,7 +1588,7 @@ odm_DIG(
 				else
 					pDM_DigTable->rx_gain_range_max = pDM_Odm->RSSI_Min + 10;
 			}
-			else{
+			else {
 
 			/* 2 Modify DIG upper bound */
 			/* 2013.03.19 Luke: Modified upper bound for Netgear rental house test */
@@ -2103,13 +2103,13 @@ odm_1R_CCA(
 				pDM_PSTable->CurCCAState = CCA_2R;
 
 		}
-		else{
+		else {
 			if (pDM_Odm->RSSI_Min <= 30)
 				pDM_PSTable->CurCCAState = CCA_2R;
 			else
 				pDM_PSTable->CurCCAState = CCA_1R;
 		}
-	} else{
+	} else {
 		pDM_PSTable->CurCCAState=CCA_MAX;
 	}
 
@@ -2162,7 +2162,7 @@ ODM_RF_Saving(
 				else
 					pDM_PSTable->CurRFState = RF_Normal;
 			}
-			else{
+			else {
 				if (pDM_Odm->RSSI_Min <= Rssi_Low_bound)
 					pDM_PSTable->CurRFState = RF_Normal;
 				else
@@ -2296,7 +2296,7 @@ u32 ODM_Get_Rate_Bitmap(
 					{
 						rate_bitmap = 0x000ff000;
 					}
-					else{
+					else {
 						if (*(pDM_Odm->pBandWidth) == ODM_BW40M)
 							rate_bitmap = 0x000ff015;
 						else
@@ -2784,7 +2784,7 @@ odm_RSSIMonitorCheckCE(
 				if (pHalData->fw_ractrl == true)/*  Report every sta's RSSI to FW */
 				{
 				}
-				else{
+				else {
 					#if (RATE_ADAPTIVE_SUPPORT == 1)
 					ODM_RA_SetRSSI_8188E(
 					&(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));
diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c
index b7627fc..eba13a5 100644
--- a/hal/odm_HWConfig.c
+++ b/hal/odm_HWConfig.c
@@ -185,7 +185,7 @@ odm_SignalScaleMapping(
 	{
 		return odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(pDM_Odm, CurrSig);
 	}
-	else{
+	else {
 		return odm_SignalScaleMapping_92CSeries(pDM_Odm,CurrSig);
 	}
 
@@ -419,7 +419,7 @@ odm_RxPhyStatus92CSeries_Parsing(
 			else if (pPhyInfo->RxPWDBAll > 40 && !pDM_Odm->bInHctTest) {
 				SQ = 100;
 			}
-			else{
+			else {
 				SQ_rpt = pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all;
 
 				if (SQ_rpt > 64)
@@ -504,7 +504,7 @@ odm_RxPhyStatus92CSeries_Parsing(
 
 		if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)) {
 			/* do nothing */
-		} else{/* pMgntInfo->CustomerID != RT_CID_819x_Lenovo */
+		} else {/* pMgntInfo->CustomerID != RT_CID_819x_Lenovo */
 			/*  */
 			/*  (3)EVM of HT rate */
 			/*  */
diff --git a/hal/odm_RegConfig8188E.c b/hal/odm_RegConfig8188E.c
index 70ca424..57de2b1 100644
--- a/hal/odm_RegConfig8188E.c
+++ b/hal/odm_RegConfig8188E.c
@@ -139,7 +139,7 @@ odm_ConfigBB_PHY_REG_PG_8188E(
 		ODM_delay_us(5);
 	} else if (Addr == 0xf9) {
 		ODM_delay_us(1);
-	} else{
+	} else {
 		ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_LOUD, ("===> @@@@@@@ ODM_ConfigBBWithHeaderFile: [PHY_REG] %08X %08X %08X\n", Addr, Bitmask, Data));
 
 		storePwrIndexDiffRateOffset(pDM_Odm->Adapter, Addr, Bitmask, Data);
@@ -173,7 +173,7 @@ odm_ConfigBB_PHY_8188E(
 	else if (Addr == 0xf9) {
 		ODM_delay_us(1);
 	}
-	else{
+	else {
 		if (Addr == 0xa24)
 			pDM_Odm->RFCalibrateInfo.RegA24 = Data;
 		ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data);
diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c
index 1f0cb27..af978e3 100644
--- a/hal/rtl8188e_cmd.c
+++ b/hal/rtl8188e_cmd.c
@@ -120,7 +120,7 @@ static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8
 		{
 			memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer, CmdLen );
 		}
-		else{
+		else {
 			memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer,3);
 			ext_cmd_len = CmdLen-3;
 			memcpy((u8*)(&h2c_cmd_ex), pCmdBuffer+3,ext_cmd_len );
@@ -170,7 +170,7 @@ u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param)
 ;
 
 	if (pHalData->fw_ractrl == true) {
-	}else{
+	} else {
 		DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__);
 		res=_FAIL;
 	}
@@ -191,7 +191,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask)
 		memcpy(buf, &lmask, 3);
 
 		FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf);
-	}else{
+	} else {
 		DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__);
 		res=_FAIL;
 	}
@@ -943,7 +943,7 @@ u8 rtl8188e_reset_tsf(struct adapter *padapter, u8 reset_port )
 ;
 	if (IFACE_PORT0==reset_port) {
 		buf[0] = 0x1; buf[1] = 0;
-	} else{
+	} else {
 		buf[0] = 0x0; buf[1] = 0x1;
 	}
 
diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index 8d94a65..22c0ef8 100644
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -709,7 +709,7 @@ static void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
 		/*  Reset MCU IO Wrapper- sugggest by SD1-Gimmy */
 		u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1);
 		rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&(~BIT3)));
-	}else{
+	} else {
 		/*  Enable MCU IO Wrapper */
 		u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1);
 		rtw_write8(padapter, REG_RSV_CTRL+1, u1bTmp|BIT3);
@@ -1830,18 +1830,18 @@ hal_EfusePgPacketRead_8188e(
 					}
 					if (bDataEmpty==false) {
 						ReadState = PG_STATE_DATA;
-					}else{/* read next header */
+					} else {/* read next header */
 						efuse_addr = efuse_addr + (word_cnts*2)+1;
 						ReadState = PG_STATE_HEADER;
 					}
 				}
-				else{/* read next header */
+				else {/* read next header */
 					efuse_addr = efuse_addr + (word_cnts*2)+1;
 					ReadState = PG_STATE_HEADER;
 				}
 
 			}
-			else{
+			else {
 				bContinual = false ;
 			}
 		}
@@ -2526,7 +2526,7 @@ ReadChipVersion8188E(struct adapter *padapter)
 	} else if (IS_2T2R(ChipVersion)) {
 		pHalData->rf_type = RF_2T2R;
 		pHalData->NumTotalRFPath = 2;
-	} else{
+	} else {
 		pHalData->rf_type = RF_1T1R;
 		pHalData->NumTotalRFPath = 1;
 	}
@@ -2577,7 +2577,7 @@ static void rtl8188e_SetHalODMVar(
 					ODM_RAInfo_Init(podmpriv,psta->mac_id);
 					#endif
 				}
-				else{
+				else {
 					DBG_8192C("### Clean STA_(%d) info\n",psta->mac_id);
 					ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS,psta->mac_id,NULL);
 			            }
@@ -3208,7 +3208,7 @@ Hal_ReadTxPowerInfo88E(
 				pHalData->EEPROMRegulatory = (EEPROM_DEFAULT_BOARD_OPTION&0x7);	/* bit0~2 */
 			else
 				pHalData->EEPROMRegulatory = (PROMContent[EEPROM_RF_BOARD_OPTION_88E]&0x7);	/* bit0~2 */
-		}else{
+		} else {
 			pHalData->EEPROMRegulatory = registry_par->regulatory_tid;
 		}
 	}
@@ -3273,7 +3273,7 @@ Hal_EfuseParseEEPROMVer88E(
 		if (pHalData->EEPROMVersion == 0xFF)
 			pHalData->EEPROMVersion = EEPROM_Default_Version;
 	}
-	else{
+	else {
 		pHalData->EEPROMVersion = 1;
 	}
 	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Hal_EfuseParseEEPROMVer(), EEVer = %d\n",
@@ -3352,7 +3352,7 @@ Hal_ReadAntennaDiversity88E(
 			if (pHalData->TRxAntDivType == 0xFF)
 				pHalData->TRxAntDivType = CG_TRX_HW_ANTDIV; /*  For 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port) */
 		}
-		else{
+		else {
 			pHalData->TRxAntDivType = registry_par->antdiv_type ;
 		}
 
diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c
index 3b375a4..a48f7f5 100644
--- a/hal/rtl8188e_phycfg.c
+++ b/hal/rtl8188e_phycfg.c
@@ -1903,7 +1903,7 @@ static void phy_SpurCalibration_8188E(
 		PHY_SetBBReg(Adapter, rOFDM1_CFOTracking, BIT(28), 0x1); /* enable CSI Mask */
 		PHY_SetBBReg(Adapter, rOFDM1_csi_fix_mask, BIT(26)|BIT(25), 0x3); /* Fix CSI Mask Tone */
 	}
-	else{
+	else {
 		PHY_SetBBReg(Adapter, rOFDM1_CFOTracking, BIT(28), 0x0); /* disable CSI Mask */
 		PHY_SetBBReg(Adapter, rOFDM1_csi_fix_mask, BIT(26)|BIT(25), 0x0);
 	}
diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c
index 589171d..bb9ee77 100644
--- a/hal/rtl8188e_rxdesc.c
+++ b/hal/rtl8188e_rxdesc.c
@@ -217,7 +217,7 @@ void update_recvframe_phyinfo_88e(
 		}
 		else
 			sa = get_sa(wlanhdr);
-	} else{
+	} else {
 		sa = get_sa(wlanhdr);
 	}
 
diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c
index 33fa0e9..954dc0e 100644
--- a/hal/rtl8188e_sreset.c
+++ b/hal/rtl8188e_sreset.c
@@ -46,7 +46,7 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 			if (psrtpriv->last_tx_complete_time == 0) {
 				psrtpriv->last_tx_complete_time = current_time;
 			}
-			else{
+			else {
 				diff_time = rtw_get_passing_time_ms(psrtpriv->last_tx_complete_time);
 				if (diff_time > 4000) {
 					u32 ability;
diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c
index 98d2d75..98a3aa5 100644
--- a/hal/rtl8188eu_xmit.c
+++ b/hal/rtl8188eu_xmit.c
@@ -270,7 +270,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 		if (pattrib->ampdu_en==true) {
 			ptxdesc->txdw2 |= cpu_to_le32(AGG_EN);/* AGG EN */
 			ptxdesc->txdw6 = cpu_to_le32(0x6666f800);
-		} else{
+		} else {
 			ptxdesc->txdw2 |= cpu_to_le32(AGG_BK);/* AGG BK */
 		}
 
@@ -814,7 +814,7 @@ static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitfr
 	if (res == _SUCCESS) {
 		rtw_dump_xframe(padapter, pxmitframe);
 	}
-	else{
+	else {
 		DBG_8192C("==> %s xmitframe_coalsece failed\n",__FUNCTION__);
 	}
 
diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index eff79b2..3cafe14 100644
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -517,7 +517,7 @@ _InitNormalChipTwoOutEpPriority(
 		mgtQ	= valueHi;
 		hiQ		= valueHi;
 	}
-	else{/* for WMM ,CONFIG_OUT_EP_WIFI_MODE */
+	else {/* for WMM ,CONFIG_OUT_EP_WIFI_MODE */
 		beQ		= valueLow;
 		bkQ		= valueHi;
 		viQ		= valueHi;
@@ -546,7 +546,7 @@ _InitNormalChipThreeOutEpPriority(
 		mgtQ	= QUEUE_HIGH;
 		hiQ		= QUEUE_HIGH;
 	}
-	else{/*  for WMM */
+	else {/*  for WMM */
 		beQ		= QUEUE_LOW;
 		bkQ		= QUEUE_NORMAL;
 		viQ		= QUEUE_NORMAL;
@@ -2528,7 +2528,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
 				pdmpriv->DMFlag = pdmpriv->InitDMFlag;
 				podmpriv->SupportAbility =	pdmpriv->InitODMFlag;
 			}
-			else{
+			else {
 				podmpriv->SupportAbility |= *((u32 *)val);
 			}
 			/* DBG_871X("HW_VAR_DM_FUNC_SET ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */
@@ -2741,7 +2741,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
 				if (rx_gain == 0xff) {/* restore rx gain */
 					ODM_Write_DIG(podmpriv,pDigTable->BackupIGValue);
 				}
-				else{
+				else {
 					pDigTable->BackupIGValue = pDigTable->CurIGValue;
 					ODM_Write_DIG(podmpriv,rx_gain);
 				}
diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 899e2f4..9afcb4a 100644
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -574,7 +574,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb)
 				RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,
 					("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n"));
 			}
-		} else{ /*  pkt_rpt_type == TX_REPORT1-CCX, TX_REPORT2-TX RTP,HIS_REPORT-USB HISR RTP */
+		} else { /*  pkt_rpt_type == TX_REPORT1-CCX, TX_REPORT2-TX RTP,HIS_REPORT-USB HISR RTP */
 			/* enqueue recvframe to txrtp queue */
 			if (pattrib->pkt_rpt_type == TX_REPORT1) {
 				/* DBG_8192C("rx CCX\n"); */
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 3b211b7..6a675fe 100644
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -1086,7 +1086,7 @@ static int rtw_wx_get_freq(struct net_device *dev,
 		wrqu->freq.i = pcur_bss->Configuration.DSConfig;
 
 	}
-	else{
+	else {
 		wrqu->freq.m = rtw_ch2freq(padapter->mlmeextpriv.cur_channel) * 100000;
 		wrqu->freq.e = 1;
 		wrqu->freq.i = padapter->mlmeextpriv.cur_channel;
@@ -2084,7 +2084,7 @@ set_rate:
 			if (fixed == 0)
 				break;
 		}
-		else{
+		else {
 			datarates[i] = 0xff;
 		}
 
@@ -5929,7 +5929,7 @@ static int rtw_dbg_port(struct net_device *dev,
 									psta->tx_vo_cnt =0;
 									psta->tx_vi_cnt =0;
 								}
-								else{
+								else {
 									if (extra_arg == psta->mac_id)
 									{
 										DBG_871X("=== sta's macaddr:" MAC_FMT "===\n", MAC_ARG(psta->hwaddr));
@@ -6033,7 +6033,7 @@ static int rtw_dbg_port(struct net_device *dev,
 					if (arg == 0xff) {
 						rtw_odm_dbg_comp_msg(padapter);
 					}
-					else{
+					else {
 						u64 dbg_comp = (u64)extra_arg;
 						rtw_odm_dbg_comp_set(padapter, dbg_comp);
 					}
@@ -6105,7 +6105,7 @@ static int rtw_dbg_port(struct net_device *dev,
 							DBG_871X("extra_arg = 5  - disable antenna diversity - BIT(4)\n");
 							DBG_871X("extra_arg = 6  - enable all dynamic func\n");
 						}
-						else{
+						else {
 							/*	extra_arg = 0  - disable all dynamic func
 								extra_arg = 1  - disable DIG
 								extra_arg = 2  - disable tx power tracking
@@ -7614,7 +7614,7 @@ static int rtw_pm_set(struct net_device *dev,
 		sscanf(extra+4, "%u", &mode);
 		ret = rtw_pm_set_ips(padapter,mode);
 	}
-	else{
+	else {
 		ret = -EINVAL;
 	}