staging: rtl8723au: We don't need two APIs to set pHalData->odmpriv.SupportAbility

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 491ba9c9afc86b33efc7310ef382b3947a3d0821..c239b5204f49dde1c7d667b7e8874c8347d9ca89 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -344,9 +344,6 @@ void ODM_CmnInfoInit23a(struct dm_odm_t *pDM_Odm,
        /*  */
        switch  (CmnInfo) {
        /*  Fixed ODM value. */
-       case    ODM_CMNINFO_ABILITY:
-               pDM_Odm->SupportAbility = (u32)Value;
-               break;
        case    ODM_CMNINFO_PLATFORM:
                break;
        case    ODM_CMNINFO_INTERFACE:
@@ -461,9 +458,6 @@ void ODM_CmnInfoUpdate23a(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value)
 {
        /*  This init variable may be changed in run time. */
        switch  (CmnInfo) {
-       case    ODM_CMNINFO_ABILITY:
-               pDM_Odm->SupportAbility = (u32)Value;
-               break;
        case    ODM_CMNINFO_RF_TYPE:
                pDM_Odm->RFType = (u8)Value;
                break;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 4383c4346cffd7b23457b9e909f6ce144b2fc5f9..204b4adf006c02ed9b8550c47f6f7c31c8635c62 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -150,8 +150,7 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
                                ODM_RF_TX_PWR_TRACK     |
                                ODM_RF_CALIBRATION;
        /*  Pointer reference */
-
-       ODM_CmnInfoUpdate23a(pDM_Odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag);
+       rtl8723a_odm_support_ability_set(Adapter, DYNAMIC_ALL_FUNC_ENABLE);
 
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_CHNL_OFFSET,
                           &pHalData->nCur40MhzPrimeSC);

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index 7598e61e08487303da920b396cc52a26ff24fba2..546cbb5920b29819766b6c41c45486a62470e67e 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -300,7 +300,6 @@ enum odm_cmninfo {
        /*  */
 
        ODM_CMNINFO_PLATFORM = 0,
-       ODM_CMNINFO_ABILITY,                                    /*  enum odm_ability */
        ODM_CMNINFO_INTERFACE,                          /*  enum odm_interface_def */
        ODM_CMNINFO_MP_TEST_CHIP,
        ODM_CMNINFO_IC_TYPE,                                    /*  enum odm_ic_type_def */