Skip to content

Commit 2c02b72

Browse files
martin-kaisergregkh
authored andcommitted
staging: r8188eu: make OFDM_24G_Diff a 1-D array
Make OFDM_24G_Diff one-dimensional array. This driver uses only OFDM_24G_Diff[0]. Acked-by: Michael Straube <[email protected]> Signed-off-by: Martin Kaiser <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 41b7c4e commit 2c02b72

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,10 +1132,10 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
11321132
DBG_88E("Index24G_BW40_Base[%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[ch]);
11331133
}
11341134
for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
1135-
pHalData->OFDM_24G_Diff[0][TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
1135+
pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
11361136
pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
11371137
DBG_88E("======= TxCount %d =======\n", TxCount);
1138-
DBG_88E("OFDM_24G_Diff[0][%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[0][TxCount]);
1138+
DBG_88E("OFDM_24G_Diff[%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[TxCount]);
11391139
DBG_88E("BW20_24G_Diff[0][%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[0][TxCount]);
11401140
}
11411141

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
592592
cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];
593593
/* 2. OFDM */
594594
ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
595-
pHalData->OFDM_24G_Diff[RF_PATH_A][RF_PATH_A];
595+
pHalData->OFDM_24G_Diff[RF_PATH_A];
596596
/* 1. BW20 */
597597
BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
598598
pHalData->BW20_24G_Diff[RF_PATH_A][RF_PATH_A];

drivers/staging/r8188eu/include/rtl8188e_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ struct hal_data_8188e {
181181
u8 Index24G_CCK_Base[CHANNEL_MAX_NUMBER];
182182
u8 Index24G_BW40_Base[CHANNEL_MAX_NUMBER];
183183
/* If only one tx, only BW20 and OFDM are used. */
184-
s8 OFDM_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
184+
s8 OFDM_24G_Diff[MAX_TX_COUNT];
185185
s8 BW20_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
186186

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

0 commit comments

Comments
 (0)