staging: rtl8723au: Remove another pile of awful unused ODM variables

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 0c4756c6f402e5400347f0826c6e7701e0a7c4b6..491ba9c9afc86b33efc7310ef382b3947a3d0821 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -433,24 +433,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm,
        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;
        /* To remove the compiler warning, must add an empty default statement to handle the other values. */
        default:
                /* do nothing */

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 06b149637cff5f82ced7cbca90ecd98080a2e170..4383c4346cffd7b23457b9e909f6ce144b2fc5f9 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -159,8 +159,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
                           &pHalData->CurrentChannelBW);
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL,
                           &pHalData->CurrentChannel);
-       ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_NET_CLOSED, &Adapter->net_closed);
-
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess);
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_POWER_SAVING,
                           &pwrctrlpriv->bpower_saving);

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index eaee9667ff8343eb38e85798625ad0bb831210ee..7598e61e08487303da920b396cc52a26ff24fba2 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -326,12 +326,6 @@ enum odm_cmninfo {
 
        ODM_CMNINFO_SCAN,
        ODM_CMNINFO_POWER_SAVING,
-       ODM_CMNINFO_ONE_PATH_CCA,                       /*  enum odm_cca_path */
-       ODM_CMNINFO_DRV_STOP,
-       ODM_CMNINFO_PNP_IN,
-       ODM_CMNINFO_INIT_ON,
-       ODM_CMNINFO_ANT_TEST,
-       ODM_CMNINFO_NET_CLOSED,
        ODM_CMNINFO_MP_MODE,
 
        ODM_CMNINFO_WIFI_DIRECT,
@@ -713,11 +707,6 @@ struct dm_odm_t {
        /*  Common info for Status */
        bool                    *pbScanInProcess;
        bool                    *pbPowerSaving;
-       /*  CCA Path 2-path/path-A/path-B = 0/1/2; using enum odm_cca_path. */
-       u8                      *pOnePathCCA;
-       /* pMgntInfo->AntennaTest */
-       u8                      *pAntennaTest;
-       bool                    *pbNet_closed;
 /*  POINTER REFERENCE----------- */
        /*  */
 /* CALL BY VALUE------------- */
@@ -783,11 +772,6 @@ struct dm_odm_t {
        /*  ================================================== */
        /*  */
 
-       /* common */
-       bool                    *pbDriverStopped;
-       bool                    *pbDriverIsGoingToPnpSetPowerSleep;
-       bool                    *pinit_adpt_in_progress;
-
        /* PSD */
        bool                    bUserAssignLevel;
        u8                      RSSI_BT;                        /* come from BT */