staging: rtl8192e: Remove unchanged variable bFwCtrlLPS

bFwCtrlLPS is just once initialized and never changed. The evaluation will
always have the same result. Remove resulting dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/d5b5cfd26648180d082f38085a807c932e87703c.1664616227.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 89bc989cffbae1e14e11bf471df90bf0a39c4d3e..10b79003c633957c9ea64ffb2e593469b71838ac 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -889,7 +889,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->rtllib->PowerSaveControl.bInactivePs = true;
        priv->rtllib->PowerSaveControl.bIPSModeBackup = false;
        priv->rtllib->PowerSaveControl.bLeisurePs = true;
-       priv->rtllib->PowerSaveControl.bFwCtrlLPS = false;
        priv->rtllib->LPSDelayCnt = 0;
        priv->rtllib->sta_sleep = LPS_IS_WAKE;
        priv->rtllib->rf_power_state = rf_on;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 8c00b111ddb2be32a366cb5f63797c699f156214..49c50ec21d04f28c2a1e0daec0390f8c7217f654 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -229,11 +229,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
                if (pPSC->LpsIdleCount >= RT_CHECK_FOR_HANG_PERIOD) {
 
                        if (priv->rtllib->ps == RTLLIB_PS_DISABLED) {
-                               if (!pPSC->bFwCtrlLPS) {
-                                       if (priv->rtllib->SetFwCmdHandler)
-                                               priv->rtllib->SetFwCmdHandler(
-                                                       dev, FW_CMD_LPS_ENTER);
-                               }
+                               if (priv->rtllib->SetFwCmdHandler)
+                                       priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_ENTER);
                                _rtl92e_ps_set_mode(dev, RTLLIB_PS_MBCAST |
                                                         RTLLIB_PS_UNICAST);
                        }
@@ -251,12 +248,8 @@ void rtl92e_leisure_ps_leave(struct net_device *dev)
        if (pPSC->bLeisurePs) {
                if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
                        _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED);
-
-                       if (!pPSC->bFwCtrlLPS) {
-                               if (priv->rtllib->SetFwCmdHandler)
-                                       priv->rtllib->SetFwCmdHandler(dev,
-                                                        FW_CMD_LPS_LEAVE);
-                       }
+                       if (priv->rtllib->SetFwCmdHandler)
+                               priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_LEAVE);
                }
        }
 }

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 3c72ed2a30a410d1edd5010749634d896ce50bf1..40bea71bcb22cccc6f68c555c06e0931c89dc8ef 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1264,9 +1264,6 @@ struct rt_pwr_save_ctrl {
 
        u32                             CurPsLevel;
        u32                             RegRfPsLevel;
-
-       bool                            bFwCtrlLPS;
-
 };
 
 #define RT_RF_CHANGE_SOURCE u32