staging: r8188eu: remove odm ext lna info

The ext lna info is never set. Remove it and fix up the one place
where it's read.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211010175204.24029-11-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 7d31067d95a8ad5a8f1e9d10c6477f550b19d08d..5bb5ce9504380c61bb15982cd4a2e2f21f8a3435 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -237,9 +237,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        case    ODM_CMNINFO_BOARD_TYPE:
                pDM_Odm->BoardType = (u8)Value;
                break;
-       case    ODM_CMNINFO_EXT_LNA:
-               pDM_Odm->ExtLNA = (u8)Value;
-               break;
        /* To remove the compiler warning, must add an empty default statement to handle the other values. */
        default:
                /* do nothing */
@@ -494,7 +491,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
 
        /* 1 Boundary Decision */
        if ((pDM_Odm->SupportICType & (ODM_RTL8192C | ODM_RTL8723A)) &&
-           ((pDM_Odm->BoardType == ODM_BOARD_HIGHPWR) || pDM_Odm->ExtLNA)) {
+           (pDM_Odm->BoardType == ODM_BOARD_HIGHPWR)) {
                if (pDM_Odm->SupportPlatform & (ODM_AP | ODM_ADSL)) {
                        dm_dig_max = DM_DIG_MAX_AP_HP;
                        dm_dig_min = DM_DIG_MIN_AP_HP;
@@ -729,8 +726,6 @@ void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm)
 
        if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD | ODM_BB_FA_CNT)))
                return;
-       if (pDM_Odm->ExtLNA)
-               return;
        if (pDM_Odm->bLinked) {
                if (pDM_Odm->RSSI_Min > 25) {
                        CurCCK_CCAThres = 0xcd;

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 90539fa2ef2d519eb683b906614e55242adddd2d..f4b427cfaeee86e322747e6a51b7480fd15ebc70 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -268,7 +268,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_IC_TYPE,            /* ODM_IC_TYPE_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 */
        /* HOOK BEFORE REG INIT-----------  */
 
        /*  Dynamic value: */
@@ -646,8 +645,6 @@ struct odm_dm_struct {
        u8      RFType;
        /*  Board Type Normal/HighPower/MiniCard/SLIM/Combo/. = 0/1/2/3/4/. */
        u8      BoardType;
-       /*  with external LNA  NO/Yes = 0/1 */
-       u8      ExtLNA;
 
        u32     BK_SupportAbility;
        u8      AntDivType;