staging: r8188eu: remove unused cases from ODM_CmnInfo{Hook,Update}

Remove unused cases from ODM_CmnInfo{Hook,Update}.

Acked-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211019135137.9893-5-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 ef29540..3aa8407 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -249,36 +249,12 @@ void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        case    ODM_CMNINFO_CHNL:
                pDM_Odm->pChannel = (u8 *)pValue;
                break;
-       case    ODM_CMNINFO_DMSP_GET_VALUE:
-               pDM_Odm->pbGetValueFromOtherMac = (bool *)pValue;
-               break;
-       case    ODM_CMNINFO_BUDDY_ADAPTOR:
-               pDM_Odm->pBuddyAdapter = (struct adapter **)pValue;
-               break;
-       case    ODM_CMNINFO_DMSP_IS_MASTER:
-               pDM_Odm->pbMasterOfDMSP = (bool *)pValue;
-               break;
        case    ODM_CMNINFO_SCAN:
                pDM_Odm->pbScanInProcess = (bool *)pValue;
                break;
        case    ODM_CMNINFO_POWER_SAVING:
                pDM_Odm->pbPowerSaving = (bool *)pValue;
                break;
-       case    ODM_CMNINFO_ONE_PATH_CCA:
-               pDM_Odm->pOnePathCCA = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_DRV_STOP:
-               pDM_Odm->pbDriverStopped =  (bool *)pValue;
-               break;
-       case    ODM_CMNINFO_PNP_IN:
-               pDM_Odm->pbDriverIsGoingToPnpSetPowerSleep =  (bool *)pValue;
-               break;
-       case    ODM_CMNINFO_INIT_ON:
-               pDM_Odm->pinit_adpt_in_progress =  (bool *)pValue;
-               break;
-       case    ODM_CMNINFO_ANT_TEST:
-               pDM_Odm->pAntennaTest =  (u8 *)pValue;
-               break;
        case    ODM_CMNINFO_NET_CLOSED:
                pDM_Odm->pbNet_closed = (bool *)pValue;
                break;
@@ -314,12 +290,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)
        case    ODM_CMNINFO_RSSI_MIN:
                pDM_Odm->RSSI_Min = (u8)Value;
                break;
-       case    ODM_CMNINFO_RA_THRESHOLD_HIGH:
-               pDM_Odm->RateAdaptive.HighRSSIThresh = (u8)Value;
-               break;
-       case    ODM_CMNINFO_RA_THRESHOLD_LOW:
-               pDM_Odm->RateAdaptive.LowRSSIThresh = (u8)Value;
-               break;
        }
 }
 

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 6aac90f..1ad7ee5 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -243,16 +243,8 @@ enum odm_common_info_def {
        ODM_CMNINFO_BW,                 /*  ODM_BW_E */
        ODM_CMNINFO_CHNL,
 
-       ODM_CMNINFO_DMSP_GET_VALUE,
-       ODM_CMNINFO_BUDDY_ADAPTOR,
-       ODM_CMNINFO_DMSP_IS_MASTER,
        ODM_CMNINFO_SCAN,
        ODM_CMNINFO_POWER_SAVING,
-       ODM_CMNINFO_ONE_PATH_CCA,       /*  ODM_CCA_PATH_E */
-       ODM_CMNINFO_DRV_STOP,
-       ODM_CMNINFO_PNP_IN,
-       ODM_CMNINFO_INIT_ON,
-       ODM_CMNINFO_ANT_TEST,
        ODM_CMNINFO_NET_CLOSED,
        ODM_CMNINFO_MP_MODE,
 /*  POINTER REFERENCE----------- */
@@ -262,8 +254,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_WIFI_DISPLAY,
        ODM_CMNINFO_LINK,
        ODM_CMNINFO_RSSI_MIN,
-       ODM_CMNINFO_RA_THRESHOLD_HIGH,          /*  u8 */
-       ODM_CMNINFO_RA_THRESHOLD_LOW,           /*  u8 */
        ODM_CMNINFO_RF_ANTENNA_TYPE,            /*  u8 */
        ODM_CMNINFO_BT_DISABLED,
        ODM_CMNINFO_BT_OPERATION,