Skip to content

Commit e9a1409

Browse files
martin-kaisergregkh
authored andcommitted
staging: r8188eu: make Index24G_CCK_Base a 1-D array
Make Index24G_CCK_Base a one-dimensional array. This driver uses only Index24G_CCK_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-3-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d1dfe7f commit e9a1409

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,14 +1121,14 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
11211121
for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
11221122
hal_get_chnl_group_88e(ch, &group);
11231123

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

11301130
DBG_88E("======= Path 0, Channel %d =======\n", ch);
1131-
DBG_88E("Index24G_CCK_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[0][ch]);
1131+
DBG_88E("Index24G_CCK_Base[%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[ch]);
11321132
DBG_88E("Index24G_BW40_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[0][ch]);
11331133
}
11341134
for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
589589
u8 index = (channel - 1);
590590

591591
/* 1. CCK */
592-
cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[RF_PATH_A][index];
592+
cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];
593593
/* 2. OFDM */
594594
ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index] +
595595
pHalData->OFDM_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
@@ -178,7 +178,7 @@ struct hal_data_8188e {
178178
u8 EEPROMRegulatory;
179179
u8 EEPROMThermalMeter;
180180

181-
u8 Index24G_CCK_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
181+
u8 Index24G_CCK_Base[CHANNEL_MAX_NUMBER];
182182
u8 Index24G_BW40_Base[RF_PATH_MAX][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];

0 commit comments

Comments
 (0)