Skip to content

Commit 27aad6c

Browse files
martin-kaisergregkh
authored andcommitted
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: 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 2c02b72 commit 27aad6c

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
@@ -1133,10 +1133,10 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
11331133
}
11341134
for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
11351135
pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
1136-
pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
1136+
pHalData->BW20_24G_Diff[TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
11371137
DBG_88E("======= TxCount %d =======\n", TxCount);
11381138
DBG_88E("OFDM_24G_Diff[%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[TxCount]);
1139-
DBG_88E("BW20_24G_Diff[0][%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[0][TxCount]);
1139+
DBG_88E("BW20_24G_Diff[%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[TxCount]);
11401140
}
11411141

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

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
595595
pHalData->OFDM_24G_Diff[RF_PATH_A];
596596
/* 1. BW20 */
597597
BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
598-
pHalData->BW20_24G_Diff[RF_PATH_A][RF_PATH_A];
598+
pHalData->BW20_24G_Diff[RF_PATH_A];
599599
/* 2. BW40 */
600600
BW40PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index];
601601
}

drivers/staging/r8188eu/include/rtl8188e_hal.h

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

187187
/* HT 20<->40 Pwr diff */
188188
u8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];

0 commit comments

Comments
 (0)