Commit 27aad6ce authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: make BW20_24G_Diff a 1-D array 



Make BW20_24G_Diff a one-dimensional array. This driver uses only
BW20_24G_Diff[0].

Acked-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220105083426.177128-8-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c02b728

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1133,10 +1133,10 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto 
	}

	for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {

		pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];

		pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];

		pHalData->BW20_24G_Diff[TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];

		DBG_88E("======= TxCount %d =======\n", TxCount);

		DBG_88E("OFDM_24G_Diff[%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[TxCount]);

		DBG_88E("BW20_24G_Diff[0][%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[0][TxCount]);

		DBG_88E("BW20_24G_Diff[%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[TxCount]);

	}



	/*  2010/10/19 MH Add Regulator recognize for CU. */

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower 
		pHalData->OFDM_24G_Diff[RF_PATH_A];

	/*  1. BW20 */

	BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +

		pHalData->BW20_24G_Diff[RF_PATH_A][RF_PATH_A];

		pHalData->BW20_24G_Diff[RF_PATH_A];

	/* 2. BW40 */

	BW40PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index];

}

drivers/staging/r8188eu/include/rtl8188e_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ struct hal_data_8188e { 
	u8	Index24G_BW40_Base[CHANNEL_MAX_NUMBER];

	/* If only one tx, only BW20 and OFDM are used. */

	s8	OFDM_24G_Diff[MAX_TX_COUNT];

	s8	BW20_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];

	s8	BW20_24G_Diff[MAX_TX_COUNT];



	/*  HT 20<->40 Pwr diff */

	u8	TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];