staging: rtl8723bs: remove rf type branching (second patch)

remove RFType field in dm_odm_t struct, keep unconditioned
all code branches related to 1T1R path, delete the others.

Remove unused variable to silence gcc warning.

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/fd41fbfba16df2b93a7593c1f853a874255e945c.1628329348.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index f87dd84434f7f810f77a28cb667231331272cea4..31f65d8178999001997ea03ae5b1dd78665bcef1 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -391,36 +391,20 @@ u32 ODM_Get_Rate_Bitmap(
        case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):
        case (ODM_WM_B|ODM_WM_N24G):
        case (ODM_WM_G|ODM_WM_N24G):
-               if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {
-                       if (rssi_level == DM_RATR_STA_HIGH)
-                               rate_bitmap = 0x000f0000;
-                       else if (rssi_level == DM_RATR_STA_MIDDLE)
-                               rate_bitmap = 0x000ff000;
-                       else {
-                               if (*(pDM_Odm->pBandWidth) == ODM_BW40M)
-                                       rate_bitmap = 0x000ff015;
-                               else
-                                       rate_bitmap = 0x000ff005;
-                       }
-               } else {
-                       if (rssi_level == DM_RATR_STA_HIGH)
-                               rate_bitmap = 0x0f8f0000;
-                       else if (rssi_level == DM_RATR_STA_MIDDLE)
-                               rate_bitmap = 0x0f8ff000;
-                       else {
-                               if (*(pDM_Odm->pBandWidth) == ODM_BW40M)
-                                       rate_bitmap = 0x0f8ff015;
-                               else
-                                       rate_bitmap = 0x0f8ff005;
-                       }
+               if (rssi_level == DM_RATR_STA_HIGH)
+                       rate_bitmap = 0x000f0000;
+               else if (rssi_level == DM_RATR_STA_MIDDLE)
+                       rate_bitmap = 0x000ff000;
+               else {
+                       if (*(pDM_Odm->pBandWidth) == ODM_BW40M)
+                               rate_bitmap = 0x000ff015;
+                       else
+                               rate_bitmap = 0x000ff005;
                }
                break;
 
        default:
-               if (pDM_Odm->RFType == RF_1T2R)
-                       rate_bitmap = 0x000fffff;
-               else
-                       rate_bitmap = 0x0fffffff;
+               rate_bitmap = 0x0fffffff;
                break;
        }
 
@@ -844,10 +828,6 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V
                pDM_Odm->SupportAbility = (u32)Value;
                break;
 
-       case ODM_CMNINFO_RF_TYPE:
-               pDM_Odm->RFType = (u8)Value;
-               break;
-
        case ODM_CMNINFO_PLATFORM:
                pDM_Odm->SupportPlatform = (u8)Value;
                break;
@@ -1094,10 +1074,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value)
                pDM_Odm->SupportAbility = (u32)Value;
                break;
 
-       case ODM_CMNINFO_RF_TYPE:
-               pDM_Odm->RFType = (u8)Value;
-               break;
-
        case ODM_CMNINFO_WIFI_DIRECT:
                pDM_Odm->bWIFI_Direct = (bool)Value;
                break;

diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index 814f4d54a96d74850308d1dc6acf0285b1809034..19cfc2915458e6c7ffc48136a43c66f77a2a3e50 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -285,7 +285,6 @@ enum odm_cmninfo_e {
        ODM_CMNINFO_IC_TYPE,                                    /*  ODM_IC_TYPE_E */
        ODM_CMNINFO_CUT_VER,                                    /*  ODM_CUT_VERSION_E */
        ODM_CMNINFO_FAB_VER,                                    /*  ODM_FAB_E */
-       ODM_CMNINFO_RF_TYPE,                                    /*  ODM_RF_PATH_E or ODM_RF_TYPE_E? */
        ODM_CMNINFO_RFE_TYPE,
        ODM_CMNINFO_PACKAGE_TYPE,
        ODM_CMNINFO_EXT_LNA,                                    /*  true */
@@ -422,7 +421,6 @@ enum { /* tag_ODM_Fab_Version_Definition */
        ODM_UMC         =       1,
 };
 
-/*  ODM_CMNINFO_RF_TYPE */
 /*  */
 /*  For example 1T2R (A+AB = BIT0|BIT4|BIT5) */
 /*  */
@@ -719,7 +717,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */
        /*  Fab Version TSMC/UMC = 0/1 */
        u8 FabVersion;
        /*  RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */
-       u8 RFType;
        u8 RFEType;
        /*  Board Type Normal/HighPower/MiniCard/SLIM/Combo/... = 0/1/2/3/4/... */
        u8 BoardType;

diff --git a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
index 1e084f01050ee2c080ef93fc18df019df3392c71..928c58be6c9b198c534990edf33cf35e73bdc67b 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
+++ b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
@@ -94,7 +94,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 {
        struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;
        struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack;
-       int CFO_kHz_A, CFO_kHz_B, CFO_ave = 0;
+       int CFO_kHz_A, CFO_ave = 0;
        int CFO_ave_diff;
        int CrystalCap = (int)pCfoTrack->CrystalCap;
        u8 Adjust_Xtal = 1;
@@ -117,12 +117,8 @@ void ODM_CfoTracking(void *pDM_VOID)
 
                /* 4 1.2 Calculate CFO */
                CFO_kHz_A =  (int)(pCfoTrack->CFO_tail[0] * 3125)  / 1280;
-               CFO_kHz_B =  (int)(pCfoTrack->CFO_tail[1] * 3125)  / 1280;
 
-               if (pDM_Odm->RFType < ODM_2T2R)
-                       CFO_ave = CFO_kHz_A;
-               else
-                       CFO_ave = (int)(CFO_kHz_A + CFO_kHz_B) >> 1;
+               CFO_ave = CFO_kHz_A;
 
                /* 4 1.3 Avoid abnormal large CFO */
                CFO_ave_diff =

diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index fb932e0618e24f1b4e8c5e0d4a2cc2b9d0d7d038..beda7b8a7c6a51bbce628f1951817f7fe304f836 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -302,8 +302,7 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)
                /* 1 Set IGI value */
                PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
 
-               if (pDM_Odm->RFType > ODM_1T1R)
-                       PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
+               PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
 
                pDM_DigTable->CurIGValue = CurrentIGI;
        }

diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
index 97acf75fc04e44da75c5a0d8a80c88261d57512a..392cc8a398f55805c3f74206423a15d07c37f4dc 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
+++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
@@ -33,10 +33,7 @@ static s16 odm_InbandNoise_Monitor_NSeries(
 
        pDM_Odm->noise_level.noise_all = 0;
 
-       if ((pDM_Odm->RFType == ODM_1T2R) || (pDM_Odm->RFType == ODM_2T2R))
-               max_rf_path = 2;
-       else
-               max_rf_path = 1;
+       max_rf_path = 1;
 
        memset(&noise_data, 0, sizeof(struct noise_level));
 

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
index c1caeaf44943ebdce184081f833f92e30008c3ea..2028791988e7113f2cf6248d4819e72fbcc7b1f5 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
@@ -49,15 +49,6 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)
        /*      ODM_CMNINFO_BINHCT_TEST only for MP Team */
        ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);
 
-
-       if (pHalData->rf_type == RF_1T1R) {
-               ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T1R);
-       } else if (pHalData->rf_type == RF_2T2R) {
-               ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T2R);
-       } else if (pHalData->rf_type == RF_1T2R) {
-               ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T2R);
-       }
-
        pdmpriv->InitODMFlag = ODM_RF_CALIBRATION|ODM_RF_TX_PWR_TRACK;
 
        ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag);