staging: rtl8723au: Remove useless ODM_CMNINFO_{WM_MODE, BAND} related code

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 4f25606ffcda23960b64c44ff4718ad66f05ca47..d9311694d25ebfc5ed082d6ba4415f0661b97ce5 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -421,12 +421,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm,
        case    ODM_CMNINFO_MAC_PHY_MODE:
                pDM_Odm->pMacPhyMode = (u8 *)pValue;
                break;
-       case    ODM_CMNINFO_WM_MODE:
-               pDM_Odm->pWirelessMode = (u8 *)pValue;
-               break;
-       case    ODM_CMNINFO_BAND:
-               pDM_Odm->pBandType = (u8 *)pValue;
-               break;
        case    ODM_CMNINFO_SEC_CHNL_OFFSET:
                pDM_Odm->pSecChOffset = (u8 *)pValue;
                break;
@@ -594,7 +588,6 @@ void odm_CmnInfoInit_Debug23a(struct dm_odm_t *pDM_Odm)
 void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm)
 {
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n"));
-       ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pWirelessMode = 0x%x\n", *(pDM_Odm->pWirelessMode)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecChOffset =%d\n", *(pDM_Odm->pSecChOffset)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecurity =%d\n", *(pDM_Odm->pSecurity)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth =%d\n", *(pDM_Odm->pBandWidth)));
@@ -1193,7 +1186,6 @@ u32 ODM_Get_Rate_Bitmap23a(struct dm_odm_t *pDM_Odm,
        struct sta_info *pEntry;
        u32 rate_bitmap = 0x0fffffff;
        u8 WirelessMode;
-       /* u8 WirelessMode =*(pDM_Odm->pWirelessMode); */
 
        pEntry = pDM_Odm->pODM_StaInfo[macid];
        if (!pEntry)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 37a11c346353a940ae14b4f64c31e877e77675e8..fe4754fdc62ed621da2693604315a6dd51fb2ac1 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -154,8 +154,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
 
        ODM_CmnInfoUpdate23a(pDM_Odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag);
 
-       ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_WM_MODE,
-                          &pmlmeext->cur_wireless_mode);
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_CHNL_OFFSET,
                           &pHalData->nCur40MhzPrimeSC);
        ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_MODE,

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index d549b7fbacf55b97dbfc137694235a6eee515b1d..6fa7de6a01eb604d78827c05b6ffcbadbaba067b 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -321,8 +321,6 @@ enum odm_cmninfo {
        /*  Dynamic value: */
        /*  */
        ODM_CMNINFO_MAC_PHY_MODE,                       /*  enum odm_mac_phy_mode */
-       ODM_CMNINFO_WM_MODE,                            /*  enum odm_wireless_mode */
-       ODM_CMNINFO_BAND,                                       /*  enum odm_band_type */
        ODM_CMNINFO_SEC_CHNL_OFFSET,            /*  enum odm_sec_chnl_offset */
        ODM_CMNINFO_SEC_MODE,                           /*  enum odm_security */
        ODM_CMNINFO_BW,                                         /*  enum odm_band_width */
@@ -713,10 +711,6 @@ struct dm_odm_t {
 
        /*  MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 */
        u8                      *pMacPhyMode;
-       /*  Wireless mode B/G/A/N = BIT0/BIT1/BIT2/BIT3 */
-       u8                      *pWirelessMode; /* enum odm_wireless_mode */
-       /*  Frequence band 2.4G/5G = 0/1 */
-       u8                      *pBandType;
        /*  Secondary channel offset don't_care/below/above = 0/1/2 */
        u8                      *pSecChOffset;
        /*  Security mode Open/WEP/AES/TKIP = 0/1/2/3 */