staging: r8188eu: remove ODM_CmnInfoHook()

Each case in ODM_CmnInfoHook() just sets a single variable. Set the
variables directly and remove ODM_CmnInfoHook().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220220100212.7466-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index e0824eefd83af742e5e6235c9b5a626a1b96fcc4..6f594ae33c6ef8a5d9f7b735cfadc2032ebfbba4 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -639,37 +639,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        pDM_Odm->BbSwingFlagOfdm                = false;
 }
 
-void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def CmnInfo, void *pValue)
-{
-       /*  */
-       /*  Hook call by reference pointer. */
-       /*  */
-       switch  (CmnInfo) {
-       /*  Dynamic call by reference pointer. */
-       case    ODM_CMNINFO_WM_MODE:
-               pDM_Odm->pWirelessMode = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_SEC_CHNL_OFFSET:
-               pDM_Odm->pSecChOffset = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_BW:
-               pDM_Odm->pBandWidth = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_CHNL:
-               pDM_Odm->pChannel = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_SCAN:
-               pDM_Odm->pbScanInProcess = (bool *)pValue;
-               break;
-       case    ODM_CMNINFO_POWER_SAVING:
-               pDM_Odm->pbPowerSaving = (bool *)pValue;
-               break;
-       default:
-               /* do nothing */
-               break;
-       }
-}
-
 /*  Update Band/CHannel/.. The values are dynamic but non-per-packet. */
 void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)
 {

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index a05d8687c18d4b6fb231f7d2118dd938ef83a37f..09e78c4855f969fc69d4efad06126be9f1bd5cac 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -38,12 +38,13 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
 
        ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag);
 
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_WM_MODE, &pmlmeext->cur_wireless_mode);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SEC_CHNL_OFFSET, &hal_data->nCur40MhzPrimeSC);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_BW, &hal_data->CurrentChannelBW);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_CHNL, &hal_data->CurrentChannel);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_POWER_SAVING, &pwrctrlpriv->bpower_saving);
+       dm_odm->pWirelessMode = &pmlmeext->cur_wireless_mode;
+       dm_odm->pSecChOffset = &hal_data->nCur40MhzPrimeSC;
+       dm_odm->pBandWidth = (u8 *)&hal_data->CurrentChannelBW;
+       dm_odm->pChannel = &hal_data->CurrentChannel;
+       dm_odm->pbScanInProcess = (bool *)&pmlmepriv->bScanInProcess;
+       dm_odm->pbPowerSaving = (bool *)&pwrctrlpriv->bpower_saving;
+
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivType);
 
        for (i = 0; i < NUM_STA; i++)

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 4c97f222987a688c177d9e8d16d7727e9b501d0e..2f9e241de5c43da87981bbb2c6308a80aadd74e2 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -124,17 +124,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_MP_TEST_CHIP,
        /* HOOK BEFORE REG INIT-----------  */
 
-       /*  Dynamic value: */
-/*  POINTER REFERENCE-----------  */
-       ODM_CMNINFO_WM_MODE,            /*  ODM_WIRELESS_MODE_E */
-       ODM_CMNINFO_SEC_CHNL_OFFSET,    /*  ODM_SEC_CHNL_OFFSET_E */
-       ODM_CMNINFO_BW,                 /*  ODM_BW_E */
-       ODM_CMNINFO_CHNL,
-
-       ODM_CMNINFO_SCAN,
-       ODM_CMNINFO_POWER_SAVING,
-/*  POINTER REFERENCE----------- */
-
 /* CALL BY VALUE------------- */
        ODM_CMNINFO_LINK,
        ODM_CMNINFO_RSSI_MIN,
@@ -470,9 +459,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm);
 void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm,
                     enum odm_common_info_def CmnInfo, u32 Value);
 
-void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm,
-                    enum odm_common_info_def CmnInfo, void *pValue);
-
 void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value);
 
 #endif