staging: r8188: ODM_BB_DIG is always set

Remove the ODM_BB_DIG capability. It is always set for this driver.

(ODM_BB_DIG was set in Update_ODM_ComInfo_88E and checked in odm_DIG,
which was always called after the capability was set.)

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211218120423.29906-9-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 8d126a3a287be48bfe3bcea390ea61f5b22d3b9d..70c83465a0a6ca0f129796b1ef9cb5e0e8ff4aef 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -349,7 +349,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
        u8 dm_dig_max, dm_dig_min;
        u8 CurrentIGI = pDM_DigTable->CurIGValue;
 
-       if ((!(pDM_Odm->SupportAbility & ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)))
+       if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
                return;
 
        if (*pDM_Odm->pbScanInProcess)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index 6a5a80bfe7e46f6e5c504b3b5f11c763337850e1..865e520a246d71e6e7f1b5f027377fa7bdbf2316 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -53,8 +53,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
        struct dm_priv  *pdmpriv = &hal_data->dmpriv;
        int i;
 
-       pdmpriv->InitODMFlag =  ODM_BB_DIG |
-                               ODM_BB_RA_MASK |
+       pdmpriv->InitODMFlag = ODM_BB_RA_MASK |
                                ODM_BB_FA_CNT |
                                ODM_BB_RSSI_MONITOR |
                                ODM_BB_CCK_PD |

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 8ab173f7c6c69618dd247490e6daae95f69f3c50..6199190e5426dcad43d035bcaa2c77e8a8c627f5 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -240,8 +240,6 @@ enum odm_common_info_def {
 
 enum odm_ability_def {
        /*  BB ODM section BIT 0-15 */
-       ODM_BB_DIG                      = BIT(0),
-
        ODM_BB_RA_MASK                  = BIT(1),
        ODM_BB_FA_CNT                   = BIT(3),
        ODM_BB_RSSI_MONITOR             = BIT(4),