staging: rtl8192e: Remove unchanged variable dig_algorithm

Remove variable dig_algorithm as its value is set to DIG_ALGO_BY_RSSI at
initialization. No further writes to dig_algorithm are done. The
equations result accordingly. Remove dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/66f7275aa46e68577cc4c20582ffbd16de13f470.1697127817.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 875540a2079d1518a00b79566496e5a60545356c..bc06c2cab35d7aee992366f0e1ad65aee0faa67a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -920,9 +920,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
                case IG_Backup:
                        initial_gain = SCAN_RX_INITIAL_GAIN;
                        BitMask = bMaskByte0;
-                       if (dm_digtable.dig_algorithm ==
-                           DIG_ALGO_BY_FALSE_ALARM)
-                               rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8);
                        priv->initgain_backup.xaagccore1 =
                                 rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1,
                                                   BitMask);
@@ -947,10 +944,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
                        break;
                case IG_Restore:
                        BitMask = 0x7f;
-                       if (dm_digtable.dig_algorithm ==
-                           DIG_ALGO_BY_FALSE_ALARM)
-                               rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8);
-
                        rtl92e_set_bb_reg(dev, rOFDM0_XAAGCCore1, BitMask,
                                         (u32)priv->initgain_backup.xaagccore1);
                        rtl92e_set_bb_reg(dev, rOFDM0_XBAGCCore1, BitMask,
@@ -965,10 +958,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
 
                        rtl92e_set_tx_power(dev,
                                         priv->rtllib->current_network.channel);
-
-                       if (dm_digtable.dig_algorithm ==
-                           DIG_ALGO_BY_FALSE_ALARM)
-                               rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1);
                        break;
                }
        }

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index bbd18b6cc252711a8dbd69ca8d7543b080ee67c6..2bbc6a67188c9a39b4e02a112547372caf4087d2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -913,8 +913,6 @@ static void _rtl92e_dm_dig_init(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       dm_digtable.dig_algorithm = DIG_ALGO_BY_RSSI;
-
        dm_digtable.dig_algorithm_switch = 0;
 
        dm_digtable.dig_state           = DM_STA_DIG_MAX;
@@ -939,12 +937,7 @@ static void _rtl92e_dm_dig_init(struct net_device *dev)
 
 static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
 {
-       if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)
-               _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(dev);
-       else if (dm_digtable.dig_algorithm == DIG_ALGO_BY_RSSI)
-               _rtl92e_dm_ctrl_initgain_byrssi_driver(dev);
-       else
-               return;
+       _rtl92e_dm_ctrl_initgain_byrssi_driver(dev);
 }
 
 /*-----------------------------------------------------------------------------

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index faf08763c34046e4ec5d266ab06aeb93b9ad1a2c..15af490d2dcde4fc2671423ad4e40a30e49e501e 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -50,7 +50,6 @@
 
 /*------------------------------Define structure----------------------------*/
 struct dig_t {
-       u8              dig_algorithm;
        u8              dig_algorithm_switch;
 
        long            rssi_low_thresh;