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>

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 6db1a587802e1a1f950c622ca1f6975f5566fe71..c706e7a411a19bfeefb7742b2f692a43e22e2ec4 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1121,14 +1121,14 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
        for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
                hal_get_chnl_group_88e(ch, &group);
 
-               pHalData->Index24G_CCK_Base[0][ch] = pwrInfo24G.IndexCCK_Base[0][group];
+               pHalData->Index24G_CCK_Base[ch] = pwrInfo24G.IndexCCK_Base[0][group];
                if (ch == 14)
                        pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][4];
                else
                        pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][group];
 
                DBG_88E("======= Path 0, Channel %d =======\n", ch);
-               DBG_88E("Index24G_CCK_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[0][ch]);
+               DBG_88E("Index24G_CCK_Base[%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[ch]);
                DBG_88E("Index24G_BW40_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[0][ch]);
        }
        for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index faabfd61f5b4c71bb26c8a6eb7b07d9e62949c3e..de7a2f5caf4898cf1b725645b96f0149879dbd0f 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -589,7 +589,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
        u8 index = (channel - 1);
 
        /*  1. CCK */
-       cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[RF_PATH_A][index];
+       cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];
        /* 2. OFDM */
        ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index] +
                pHalData->OFDM_24G_Diff[RF_PATH_A][RF_PATH_A];

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 25f3c04e81b7bf3176e0ce643122d84dd68fab4a..66b525ca3510a3566282003bfd60897553bdfff1 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -178,7 +178,7 @@ struct hal_data_8188e {
        u8      EEPROMRegulatory;
        u8      EEPROMThermalMeter;
 
-       u8      Index24G_CCK_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
+       u8      Index24G_CCK_Base[CHANNEL_MAX_NUMBER];
        u8      Index24G_BW40_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
        /* If only one tx, only BW20 and OFDM are used. */
        s8      CCK_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];