Skip to content

Commit eeb35e4

Browse files
martin-kaisergregkh
authored andcommitted
staging: r8188eu: make Index24G_BW40_Base a 1-D array
Make Index24G_BW40_Base a one-dimensional array. This driver uses only Index24G_BW40_Base[0]. Acked-by: Michael Straube <straube.linux@gmail.com> Signed-off-by: Martin Kaiser <martin@kaiser.cx> Link: https://lore.kernel.org/r/20220105083426.177128-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e9a1409 commit eeb35e4

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,13 +1123,13 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
11231123

11241124
pHalData->Index24G_CCK_Base[ch] = pwrInfo24G.IndexCCK_Base[0][group];
11251125
if (ch == 14)
1126-
pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][4];
1126+
pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][4];
11271127
else
1128-
pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][group];
1128+
pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][group];
11291129

11301130
DBG_88E("======= Path 0, Channel %d =======\n", ch);
11311131
DBG_88E("Index24G_CCK_Base[%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[ch]);
1132-
DBG_88E("Index24G_BW40_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[0][ch]);
1132+
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++) {
11351135
pHalData->CCK_24G_Diff[0][TxCount] = pwrInfo24G.CCK_Diff[0][TxCount];

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,13 +591,13 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
591591
/* 1. CCK */
592592
cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];
593593
/* 2. OFDM */
594-
ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index] +
594+
ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
595595
pHalData->OFDM_24G_Diff[RF_PATH_A][RF_PATH_A];
596596
/* 1. BW20 */
597-
BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index] +
597+
BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
598598
pHalData->BW20_24G_Diff[RF_PATH_A][RF_PATH_A];
599599
/* 2. BW40 */
600-
BW40PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index];
600+
BW40PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index];
601601
}
602602

603603
static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,

drivers/staging/r8188eu/include/rtl8188e_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ struct hal_data_8188e {
179179
u8 EEPROMThermalMeter;
180180

181181
u8 Index24G_CCK_Base[CHANNEL_MAX_NUMBER];
182-
u8 Index24G_BW40_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
182+
u8 Index24G_BW40_Base[CHANNEL_MAX_NUMBER];
183183
/* If only one tx, only BW20 and OFDM are used. */
184184
s8 CCK_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
185185
s8 OFDM_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];

0 commit comments

Comments
 (0)