staging: r8188eu: remove odm cut version info

The cut version info is set but not used. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211010175204.24029-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 17427bec9832be85104ff6e77f02775928ed3d05..cd09cdbdb863491e05177c52dda52e6402857709 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -228,9 +228,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        case    ODM_CMNINFO_IC_TYPE:
                pDM_Odm->SupportICType = Value;
                break;
-       case    ODM_CMNINFO_CUT_VER:
-               pDM_Odm->CutVersion = (u8)Value;
-               break;
        case    ODM_CMNINFO_RF_TYPE:
                pDM_Odm->RFType = (u8)Value;
                break;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index c752c106980a62cdec0066bb93c45eed743948c8..54cf0d6d726fd75efeecbb59d9b4c907ef2ac841 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -31,7 +31,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
        struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
        struct dm_priv  *pdmpriv = &hal_data->dmpriv;
        struct odm_dm_struct *dm_odm = &hal_data->odmpriv;
-       u8 cut_ver;
 
        /*  Init Value */
        memset(dm_odm, 0, sizeof(*dm_odm));
@@ -44,10 +43,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
 
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);
 
-       cut_ver = ODM_CUT_A;
-
-       ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_CUT_VER, cut_ver);
-
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data->VersionID));
 
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 527898571a54a1b81cc93d3c64bc6aec944e4aec..b3a9902761dfc28e4a8db471db5a13118b970942 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -266,7 +266,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_INTERFACE,          /* ODM_INTERFACE_E */
        ODM_CMNINFO_MP_TEST_CHIP,
        ODM_CMNINFO_IC_TYPE,            /* ODM_IC_TYPE_E */
-       ODM_CMNINFO_CUT_VER,            /* ODM_CUT_VERSION_E */
        ODM_CMNINFO_RF_TYPE,            /* RF_PATH_E or ODM_RF_TYPE_E? */
        ODM_CMNINFO_BOARD_TYPE,         /* ODM_BOARD_TYPE_E */
        ODM_CMNINFO_EXT_LNA,            /* true */
@@ -372,17 +371,6 @@ enum odm_ic_type {
        ODM_RTL8821     =       BIT(6),
 };
 
-/* ODM_CMNINFO_CUT_VER */
-enum odm_cut_version {
-       ODM_CUT_A       =       1,
-       ODM_CUT_B       =       2,
-       ODM_CUT_C       =       3,
-       ODM_CUT_D       =       4,
-       ODM_CUT_E       =       5,
-       ODM_CUT_F       =       6,
-       ODM_CUT_TEST    =       7,
-};
-
 /*  ODM_CMNINFO_RF_TYPE */
 /*  For example 1T2R (A+AB = BIT(0)|BIT(4)|BIT(5)) */
 enum odm_rf_path {
@@ -659,8 +647,6 @@ struct odm_dm_struct {
        /*  ODM composite or independent. Bit oriented/ 92C+92D+ .... or any
         *  other type = 1/2/3/... */
        u32     SupportICType;
-       /*  Cut Version TestChip/A-cut/B-cut... = 0/1/2/3/... */
-       u8      CutVersion;
        /*  RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */
        u8      RFType;
        /*  Board Type Normal/HighPower/MiniCard/SLIM/Combo/. = 0/1/2/3/4/. */