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 <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220105083426.177128-7-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 6d86107..2786112 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1132,10 +1132,10 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
                DBG_88E("Index24G_BW40_Base[%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[ch]);
        }
        for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-               pHalData->OFDM_24G_Diff[0][TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
+               pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
                pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
                DBG_88E("======= TxCount %d =======\n", TxCount);
-               DBG_88E("OFDM_24G_Diff[0][%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[0][TxCount]);
+               DBG_88E("OFDM_24G_Diff[%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[TxCount]);
                DBG_88E("BW20_24G_Diff[0][%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[0][TxCount]);
        }
 

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index 650de81..3b5ddc0 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -592,7 +592,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower
        cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];
        /* 2. OFDM */
        ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
-               pHalData->OFDM_24G_Diff[RF_PATH_A][RF_PATH_A];
+               pHalData->OFDM_24G_Diff[RF_PATH_A];
        /*  1. BW20 */
        BW20PowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[index] +
                pHalData->BW20_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 0f743c3..e748bdc 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -181,7 +181,7 @@ struct hal_data_8188e {
        u8      Index24G_CCK_Base[CHANNEL_MAX_NUMBER];
        u8      Index24G_BW40_Base[CHANNEL_MAX_NUMBER];
        /* If only one tx, only BW20 and OFDM are used. */
-       s8      OFDM_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
+       s8      OFDM_24G_Diff[MAX_TX_COUNT];
        s8      BW20_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];
 
        /*  HT 20<->40 Pwr diff */