diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index 1683f01..6eb14e5 100644
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -3157,15 +3157,10 @@ Hal_ReadTxPowerInfo88E(
 	if (!AutoLoadFail)
 		pHalData->bTXPowerDataReadFromEEPORM = true;
 
-	/* for (rfPath = 0 ; rfPath < MAX_RF_PATH ; rfPath++) */
-	for (rfPath = 0 ; rfPath < pHalData->NumTotalRFPath ; rfPath++)
-	{
-		for (ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++)
-		{
+	for (rfPath = 0 ; rfPath < pHalData->NumTotalRFPath ; rfPath++) {
+		for (ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++) {
 			bIn24G = Hal_GetChnlGroup88E(ch+1,&group);
-			if (bIn24G)
-			{
-
+			if (bIn24G) {
 				pHalData->Index24G_CCK_Base[rfPath][ch]=pwrInfo24G.IndexCCK_Base[rfPath][group];
 
 				if (ch==(14-1))
diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h
index 9cbc887..455fe91 100644
--- a/include/rtl8188e_hal.h
+++ b/include/rtl8188e_hal.h
@@ -198,13 +198,13 @@ typedef struct _TxPowerInfo
 } TxPowerInfo, *PTxPowerInfo;
 
 typedef struct _TxPowerInfo24G{
-	u8 IndexCCK_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
-	u8 IndexBW40_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G-1];
+	u8 IndexCCK_Base[RF_PATH_MAX][MAX_CHNL_GROUP_24G];
+	u8 IndexBW40_Base[RF_PATH_MAX][MAX_CHNL_GROUP_24G-1];
 	/* If only one tx, only BW20 and OFDM are used. */
-	s8 CCK_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8 OFDM_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8 BW20_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8 BW40_Diff[MAX_RF_PATH][MAX_TX_COUNT];
+	s8 CCK_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8 OFDM_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8 BW20_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8 BW40_Diff[RF_PATH_MAX][MAX_TX_COUNT];
 }TxPowerInfo24G, *PTxPowerInfo24G;
 
 #define EFUSE_REAL_CONTENT_LEN		512
@@ -325,13 +325,13 @@ typedef struct hal_data_8188e {
 	/* u8	bIQKInitialized; */
 
 
-	u8	Index24G_CCK_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];
-	u8	Index24G_BW40_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];
+	u8	Index24G_CCK_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
+	u8	Index24G_BW40_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
 	/* If only one tx, only BW20 and OFDM are used. */
-	s8	CCK_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8	OFDM_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8	BW20_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
-	s8	BW40_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
+	s8	CCK_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8	OFDM_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8	BW20_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+	s8	BW40_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
 
 	u8	TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
 	u8	TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER];	/*  For HT 40MHZ pwr */