staging: rtl8723au: Remove rf type from struct hal_version

This gets rid of yet another duplicated copy of the RF type

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/HalDMOutSrc8723A_CE.c b/drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
index 00faa6c..2dac6f0 100644 (file)
--- a/drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
+++ b/drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
@@ -978,12 +978,10 @@ void rtl8723a_phy_iq_calibrate(struct rtw_adapter *pAdapter, bool bReCovery)
        is13simular = false;
 
        for (i = 0; i < 3; i++) {
-               if (IS_92C_SERIAL(pHalData->VersionID)) {
-                        _PHY_IQCalibrate(pAdapter, result, i, true);
-               } else {
-                       /*  For 88C 1T1R */
+               if (pHalData->rf_type == RF_2T2R)
+                       _PHY_IQCalibrate(pAdapter, result, i, true);
+               else /*  For 88C 1T1R */
                        _PHY_IQCalibrate(pAdapter, result, i, false);
-               }
 
                if (i == 1) {
                        is12simular = _PHY_SimularityCompare(pAdapter, result, 0, 1);
@@ -1051,9 +1049,10 @@ void rtl8723a_phy_iq_calibrate(struct rtw_adapter *pAdapter, bool bReCovery)
        if ((RegE94 != 0)/*&&(RegEA4 != 0)*/)
                _PHY_PathAFillIQKMatrix(pAdapter, bPathAOK, result, final_candidate, (RegEA4 == 0));
 
-       if (IS_92C_SERIAL(pHalData->VersionID)) {
+       if (pHalData->rf_type == RF_2T2R) {
                if ((RegEB4 != 0)/*&&(RegEC4 != 0)*/)
-               _PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result, final_candidate, (RegEC4 == 0));
+                       _PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result,
+                                               final_candidate, (RegEC4 == 0));
        }
 
        _PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup_recover, 9);
@@ -1072,12 +1071,10 @@ void rtl8723a_phy_lc_calibrate(struct rtw_adapter *pAdapter)
        if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS)
                return;
 
-       if (IS_92C_SERIAL(pHalData->VersionID)) {
+       if (pHalData->rf_type == RF_2T2R)
                _PHY_LCCalibrate(pAdapter, true);
-       } else {
-               /*  For 88C 1T1R */
+       else    /*  For 88C 1T1R */
                _PHY_LCCalibrate(pAdapter, false);
-       }
 }
 
 void

diff --git a/drivers/staging/rtl8723au/hal/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c
index c9bb3e1..db7d57e 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_com.c
+++ b/drivers/staging/rtl8723au/hal/hal_com.c
@@ -22,46 +22,6 @@
 
 #define _HAL_INIT_C_
 
-void dump_chip_info23a(struct hal_version ChipVersion)
-{
-       int cnt = 0;
-       u8 buf[128];
-
-       cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8723A_");
-
-       cnt += sprintf((buf + cnt), "%s_", IS_NORMAL_CHIP(ChipVersion) ?
-                      "Normal_Chip" : "Test_Chip");
-       cnt += sprintf((buf + cnt), "%s_",
-                      IS_CHIP_VENDOR_TSMC(ChipVersion) ? "TSMC" : "UMC");
-       if (IS_A_CUT(ChipVersion))
-               cnt += sprintf((buf + cnt), "A_CUT_");
-       else if (IS_B_CUT(ChipVersion))
-               cnt += sprintf((buf + cnt), "B_CUT_");
-       else if (IS_C_CUT(ChipVersion))
-               cnt += sprintf((buf + cnt), "C_CUT_");
-       else if (IS_D_CUT(ChipVersion))
-               cnt += sprintf((buf + cnt), "D_CUT_");
-       else if (IS_E_CUT(ChipVersion))
-               cnt += sprintf((buf + cnt), "E_CUT_");
-       else
-               cnt += sprintf((buf + cnt), "UNKNOWN_CUT(%d)_",
-                              ChipVersion.CUTVersion);
-
-       if (IS_1T1R(ChipVersion))
-               cnt += sprintf((buf + cnt), "1T1R_");
-       else if (IS_1T2R(ChipVersion))
-               cnt += sprintf((buf + cnt), "1T2R_");
-       else if (IS_2T2R(ChipVersion))
-               cnt += sprintf((buf + cnt), "2T2R_");
-       else
-               cnt += sprintf((buf + cnt), "UNKNOWN_RFTYPE(%d)_",
-                              ChipVersion.RFType);
-
-       cnt += sprintf((buf + cnt), "RomVer(%d)\n", ChipVersion.ROMVer);
-
-       DBG_8723A("%s", buf);
-}
-
 #define        EEPROM_CHANNEL_PLAN_BY_HW_MASK  0x80
 
 /* return the final channel plan decision */

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
index 3304e55..11e1108 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
@@ -169,10 +169,8 @@ void rtl8723a_set_FwPwrMode_cmd(struct rtw_adapter *padapter, u8 Mode)
            prevent conficting setting in Fw power */
        /*  saving sequence. 2010.06.07. Added by tynli.
            Suggested by SD3 yschang. */
-       if ((Mode != PS_MODE_ACTIVE) &&
-           (!IS_92C_SERIAL(pHalData->VersionID))) {
+       if (Mode != PS_MODE_ACTIVE && pHalData->rf_type != RF_2T2R)
                ODM_RF_Saving23a(&pHalData->odmpriv, true);
-       }
 
        H2CSetPwrMode.Mode = Mode;
        H2CSetPwrMode.SmartPS = pwrpriv->smart_ps;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index eb82c0b..a5729d3 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -744,7 +744,7 @@ void rtl8723a_read_chip_version(struct rtw_adapter *padapter)
        value32 = rtl8723au_read32(padapter, REG_SYS_CFG);
        ChipVersion.ICType = CHIP_8723A;
        ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
-       ChipVersion.RFType = RF_TYPE_1T1R;
+       pHalData->rf_type = RF_1T1R;
        ChipVersion.VendorType =
                ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);
        ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_SHIFT;   /*  IC version (CUT) */
@@ -768,16 +768,8 @@ void rtl8723a_read_chip_version(struct rtw_adapter *padapter)
        pHalData->PolarityCtl =
                ((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT :
                 RT_POLARITY_LOW_ACT);
-       dump_chip_info23a(ChipVersion);
        pHalData->VersionID = ChipVersion;
 
-       if (IS_1T2R(ChipVersion))
-               pHalData->rf_type = RF_1T2R;
-       else if (IS_2T2R(ChipVersion))
-               pHalData->rf_type = RF_2T2R;
-       else
-               pHalData->rf_type = RF_1T1R;
-
        MSG_8723A("RF_Type is %x!!\n", pHalData->rf_type);
 }
 

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
index 19dc5e3..2cdadc2 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
@@ -419,7 +419,6 @@ PHY_SetRFReg(struct rtw_adapter *Adapter, enum RF_RADIO_PATH eRFPath,
 int PHY_MACConfig8723A(struct rtw_adapter *Adapter)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
-       bool is92C = IS_92C_SERIAL(pHalData->VersionID);
 
        /*  */
        /*  Config MAC */
@@ -429,7 +428,8 @@ int PHY_MACConfig8723A(struct rtw_adapter *Adapter)
        /*  2010.07.13 AMPDU aggregation number 9 */
        /* rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); */
        rtl8723au_write8(Adapter, REG_MAX_AGGR_NUM, 0x0A);
-       if (is92C && (BOARD_USB_DONGLE == pHalData->BoardType))
+       if (pHalData->rf_type == RF_2T2R &&
+           BOARD_USB_DONGLE == pHalData->BoardType)
                rtl8723au_write8(Adapter, 0x40, 0x04);
 
        return _SUCCESS;

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 1738934..a5e881b 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -447,22 +447,9 @@ static void _InitRetryFunction(struct rtw_adapter *Adapter)
 static void _InitRFType(struct rtw_adapter *Adapter)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
-       bool is92CU = IS_92C_SERIAL(pHalData->VersionID);
 
        pHalData->rf_chip = RF_6052;
-
-       if (!is92CU) {
-               pHalData->rf_type = RF_1T1R;
-               DBG_8723A("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n");
-               return;
-       }
-
-       /*  TODO: Consider that EEPROM set 92CU to 1T1R later. */
-       /*  Force to overwrite setting according to chip version. Ignore
-           EEPROM setting. */
-       /* pHalData->RF_Type = is92CU ? RF_2T2R : RF_1T1R; */
-       MSG_8723A("Set RF Chip ID to RF_6052 and RF type to %d.\n",
-                 pHalData->rf_type);
+       pHalData->rf_type = RF_1T1R;
 }
 
 /*  Set CCK and OFDM Block "ON" */

diff --git a/drivers/staging/rtl8723au/include/HalVerDef.h b/drivers/staging/rtl8723au/include/HalVerDef.h
index 607b71f..2a0e4ea 100644 (file)
--- a/drivers/staging/rtl8723au/include/HalVerDef.h
+++ b/drivers/staging/rtl8723au/include/HalVerDef.h
@@ -51,30 +51,17 @@ enum hal_vendor {
        CHIP_VENDOR_UMC         =       1,
 };
 
-enum hal_rf_type {
-       RF_TYPE_1T1R    =       0,
-       RF_TYPE_1T2R    =       1,
-       RF_TYPE_2T2R    =       2,
-       RF_TYPE_2T3R    =       3,
-       RF_TYPE_2T4R    =       4,
-       RF_TYPE_3T3R    =       5,
-       RF_TYPE_3T4R    =       6,
-       RF_TYPE_4T4R    =       7,
-};
-
 struct hal_version {
        enum hal_ic_type        ICType;
        enum hal_chip_type      ChipType;
        enum hal_cut_version    CUTVersion;
        enum hal_vendor         VendorType;
-       enum hal_rf_type        RFType;
        u8                      ROMVer;
 };
 
 /*  Get element */
 #define GET_CVID_IC_TYPE(version)      ((version).ICType)
 #define GET_CVID_CHIP_TYPE(version)    ((version).ChipType)
-#define GET_CVID_RF_TYPE(version)      ((version).RFType)
 #define GET_CVID_MANUFACTUER(version)  ((version).VendorType)
 #define GET_CVID_CUT_VERSION(version)  ((version).CUTVersion)
 #define GET_CVID_ROM_VERSION(version)  (((version).ROMVer) & ROM_VERSION_MASK)
@@ -108,17 +95,8 @@ struct hal_version {
 #define IS_CHIP_VENDOR_UMC(version)            \
        ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false)
 
-#define IS_1T1R(version)                       \
-       ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false)
-#define IS_1T2R(version)                       \
-       ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false)
-#define IS_2T2R(version)                       \
-       ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false)
-
 /* Chip version Macro. -- */
 
-#define IS_92C_SERIAL(version)                                 \
-       ((IS_81XXC(version) && IS_2T2R(version)) ? true : false)
 #define IS_81xxC_VENDOR_UMC_A_CUT(version)                     \
        (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ?       \
        (IS_A_CUT(version) ? true : false) : false) : false)

diff --git a/drivers/staging/rtl8723au/include/hal_com.h b/drivers/staging/rtl8723au/include/hal_com.h
index e946c4b..9c50320 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_com.h
+++ b/drivers/staging/rtl8723au/include/hal_com.h
@@ -116,7 +116,6 @@
 #define REG_NOA_DESC_COUNT                     0x05EC
 
 #include "HalVerDef.h"
-void dump_chip_info23a(struct hal_version      ChipVersion);
 
 
 u8     /* return the final channel plan decision */