staging: r8188eu: remove odm hct test info

The "in hct test" variable is never set, it's always 0.

Remove the variable and fix up the one place where it was used.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211010175204.24029-8-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 f76bdf3d9a80e28e40c8e5a1aa5018d8e906e33d..c094cffb9e6aefdec06afd3f8645d0b0fcafd3f5 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -246,9 +246,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        case    ODM_CMNINFO_EXT_TRSW:
                pDM_Odm->ExtTRSW = (u8)Value;
                break;
-       case    ODM_CMNINFO_BINHCT_TEST:
-               pDM_Odm->bInHctTest = (bool)Value;
-               break;
        /* To remove the compiler warning, must add an empty default statement to handle the other values. */
        default:
                /* do nothing */

diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r8188eu/hal/odm_HWConfig.c
index 2ae1a001d339145628a4ae7c1d4e341884e7f262..8e419fd88a12c12a1bf7991feefea68e0df58c22 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c
@@ -143,7 +143,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
                if (pPktinfo->bPacketMatchBSSID) {
                        u8 SQ, SQ_rpt;
 
-                       if (pPhyInfo->RxPWDBAll > 40 && !dm_odm->bInHctTest) {
+                       if (pPhyInfo->RxPWDBAll > 40) {
                                SQ = 100;
                        } else {
                                SQ_rpt = pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all;

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index a4e5d4f9f0b9d1d874dee5ccf398dfe08adc3321..462424f0a49b9f28333777caa3e53efa8e7233b3 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -271,7 +271,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_EXT_LNA,            /* true */
        ODM_CMNINFO_EXT_PA,
        ODM_CMNINFO_EXT_TRSW,
-       ODM_CMNINFO_BINHCT_TEST,
        /* HOOK BEFORE REG INIT-----------  */
 
        /*  Dynamic value: */
@@ -655,7 +654,6 @@ struct odm_dm_struct {
        u8      ExtPA;
        /*  with external TRSW  NO/Yes = 0/1 */
        u8      ExtTRSW;
-       bool    bInHctTest;
 
        u32     BK_SupportAbility;
        u8      AntDivType;