staging: r8188eu: remove ICType from struct HAL_VERSION

IC type is always 8188E. Remove ICType from struct HAL_VERSION,
all macros that check it and related code.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210830092153.9283-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_com.c b/drivers/staging/r8188eu/hal/hal_com.c
index f09d4d4..eee57cb 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_com.c
+++ b/drivers/staging/r8188eu/hal/hal_com.c
@@ -15,18 +15,7 @@ void dump_chip_info(struct HAL_VERSION       chip_vers)
        uint cnt = 0;
        char buf[128];
 
-       if (IS_81XXC(chip_vers)) {
-               cnt += sprintf((buf + cnt), "Chip Version Info: %s_",
-                              IS_92C_SERIAL(chip_vers) ?
-                              "CHIP_8192C" : "CHIP_8188C");
-       } else if (IS_92D(chip_vers)) {
-               cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8192D_");
-       } else if (IS_8723_SERIES(chip_vers)) {
-               cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8723A_");
-       } else if (IS_8188E(chip_vers)) {
-               cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8188E_");
-       }
-
+       cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8188E_");
        cnt += sprintf((buf + cnt), "%s_", IS_NORMAL_CHIP(chip_vers) ?
                       "Normal_Chip" : "Test_Chip");
        cnt += sprintf((buf + cnt), "%s_", IS_CHIP_VENDOR_TSMC(chip_vers) ?

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 1475836..3da5c27 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1698,7 +1698,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter)
        pHalData = GET_HAL_DATA(padapter);
 
        value32 = rtw_read32(padapter, REG_SYS_CFG);
-       ChipVersion.ICType = CHIP_8188E;
        ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
 
        ChipVersion.RFType = RF_TYPE_1T1R;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_mp.c b/drivers/staging/r8188eu/hal/rtl8188e_mp.c
index ec1d7e9..ee0c968 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_mp.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_mp.c
@@ -487,9 +487,6 @@ void Hal_SetSingleCarrierTx(struct adapter *pAdapter, u8 bStart)
 
 void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
 {
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(pAdapter);
-       bool            is92C = IS_92C_SERIAL(pHalData->VersionID);
-
        u8 rfPath;
        u32              reg58 = 0x0;
        switch (pAdapter->mppriv.antenna_tx) {
@@ -518,21 +515,10 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
                PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x0);
                PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x0);
 
-               if (is92C) {
-                       _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT(19), 0x01);
-                       rtw_usleep_os(100);
-                       if (rfPath == RF_PATH_A)
-                               write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x10000); /*  PAD all on. */
-                       else if (rfPath == RF_PATH_B)
-                               write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x10000); /*  PAD all on. */
-                       write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */
-                       rtw_usleep_os(100);
-               } else {
-                       write_rfreg(pAdapter, rfPath, 0x21, 0xd4000);
-                       rtw_usleep_os(100);
-                       write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */
-                       rtw_usleep_os(100);
-               }
+               write_rfreg(pAdapter, rfPath, 0x21, 0xd4000);
+               rtw_usleep_os(100);
+               write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */
+               rtw_usleep_os(100);
 
                /* for dynamic set Power index. */
                write_bbreg(pAdapter, rFPGA0_XA_HSSIParameter1, bMaskDWord, 0x01000500);
@@ -549,18 +535,11 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
                }
                write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x1);
                write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
-               if (is92C) {
-                       _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT(19), 0x00);
-                       rtw_usleep_os(100);
-                       write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x32d75); /*  PAD all on. */
-                       write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x32d75); /*  PAD all on. */
-                       rtw_usleep_os(100);
-               } else {
-                       write_rfreg(pAdapter, rfPath, 0x21, 0x54000);
-                       rtw_usleep_os(100);
-                       write_rfreg(pAdapter, rfPath, 0x00, 0x30000); /*  PAD all on. */
-                       rtw_usleep_os(100);
-               }
+
+               write_rfreg(pAdapter, rfPath, 0x21, 0x54000);
+               rtw_usleep_os(100);
+               write_rfreg(pAdapter, rfPath, 0x00, 0x30000); /*  PAD all on. */
+               rtw_usleep_os(100);
 
                /* Stop for dynamic set Power index. */
                write_bbreg(pAdapter, rFPGA0_XA_HSSIParameter1, bMaskDWord, 0x01000100);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 5cdabf4..147c512 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1765,7 +1765,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 
                        /*  Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */
                        /*  saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */
-                       if ((psmode != PS_MODE_ACTIVE) && (!IS_92C_SERIAL(haldata->VersionID)))
+                       if (psmode != PS_MODE_ACTIVE)
                                ODM_RF_Saving(podmpriv, true);
                        rtl8188e_set_FwPwrMode_cmd(Adapter, psmode);
                }

diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/r8188eu/include/HalVerDef.h
index a0f5bf5..3a687f7 100644 (file)
--- a/drivers/staging/r8188eu/include/HalVerDef.h
+++ b/drivers/staging/r8188eu/include/HalVerDef.h
@@ -3,20 +3,6 @@
 #ifndef __HAL_VERSION_DEF_H__
 #define __HAL_VERSION_DEF_H__
 
-enum HAL_IC_TYPE {
-       CHIP_8192S      =       0,
-       CHIP_8188C      =       1,
-       CHIP_8192C      =       2,
-       CHIP_8192D      =       3,
-       CHIP_8723A      =       4,
-       CHIP_8188E      =       5,
-       CHIP_8881A      =       6,
-       CHIP_8812A      =       7,
-       CHIP_8821A      =       8,
-       CHIP_8723B      =       9,
-       CHIP_8192E      =       10,
-};
-
 enum HAL_CHIP_TYPE {
        TEST_CHIP       =       0,
        NORMAL_CHIP     =       1,
@@ -50,7 +36,6 @@ enum HAL_RF_TYPE {
 };
 
 struct HAL_VERSION {
-       enum HAL_IC_TYPE        ICType;
        enum HAL_CHIP_TYPE      ChipType;
        enum HAL_CUT_VERSION    CUTVersion;
        enum HAL_VENDOR         VendorType;
@@ -59,7 +44,6 @@ struct HAL_VERSION {
 };
 
 /*  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))
@@ -69,17 +53,6 @@ struct HAL_VERSION {
 /* Common Macro. -- */
 /* HAL_VERSION VersionID */
 
-/*  HAL_IC_TYPE_E */
-#define IS_81XXC(version)                              \
-       (((GET_CVID_IC_TYPE(version) == CHIP_8192C) ||  \
-        (GET_CVID_IC_TYPE(version) == CHIP_8188C)) ? true : false)
-#define IS_8723_SERIES(version)                                \
-       ((GET_CVID_IC_TYPE(version) == CHIP_8723A) ? true : false)
-#define IS_92D(version)                                        \
-       ((GET_CVID_IC_TYPE(version) == CHIP_8192D) ? true : false)
-#define IS_8188E(version)                              \
-       ((GET_CVID_IC_TYPE(version) == CHIP_8188E) ? true : false)
-
 /* HAL_CHIP_TYPE_E */
 #define IS_TEST_CHIP(version)                          \
        ((GET_CVID_CHIP_TYPE(version) == TEST_CHIP) ? true : false)
@@ -112,38 +85,4 @@ struct HAL_VERSION {
 #define IS_2T2R(version)                               \
        ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false)
 
-/* Chip version Macro. -- */
-#define IS_81XXC_TEST_CHIP(version)                    \
-       ((IS_81XXC(version) && (!IS_NORMAL_CHIP(version))) ? true : false)
-
-#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)
-#define IS_81xxC_VENDOR_UMC_B_CUT(version)             \
-       (IS_81XXC(version) ? (IS_CHIP_VENDOR_UMC(version) ?     \
-       (IS_B_CUT(version) ? true : false) : false) : false)
-#define IS_81xxC_VENDOR_UMC_C_CUT(version)             \
-       (IS_81XXC(version) ? (IS_CHIP_VENDOR_UMC(version) ? \
-        (IS_C_CUT(version) ? true : false) : false) : false)
-
-#define IS_NORMAL_CHIP92D(version)                     \
-       ((IS_92D(version)) ?                            \
-       ((GET_CVID_CHIP_TYPE(version) == NORMAL_CHIP) ? true : false) : false)
-
-#define IS_92D_SINGLEPHY(version)                      \
-       ((IS_92D(version)) ? (IS_2T2R(version) ? true : false) : false)
-#define IS_92D_C_CUT(version)                          \
-       ((IS_92D(version)) ? (IS_C_CUT(version) ? true : false) : false)
-#define IS_92D_D_CUT(version)                          \
-       ((IS_92D(version)) ? (IS_D_CUT(version) ? true : false) : false)
-#define IS_92D_E_CUT(version)                          \
-       ((IS_92D(version)) ? (IS_E_CUT(version) ? true : false) : false)
-
-#define IS_8723A_A_CUT(version)                                \
-       ((IS_8723_SERIES(version)) ? (IS_A_CUT(version) ? true : false) : false)
-#define IS_8723A_B_CUT(version)                                \
-       ((IS_8723_SERIES(version)) ? (IS_B_CUT(version) ? true : false) : false)
-
 #endif