staging: rtl8192e: Remove unchanged variable bInactivePs

bInactivePs 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/9f46eebf8220a06a1889eaf2d6bac74dd08cfd1f.1664616227.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 41faeb4b9b9b434989d6c2badbf090c9045a0954..8c3ce6cc2541af10668831e822a0dca212e441ec 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -81,17 +81,15 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
        enum rt_rf_power_state rt_state;
 
        rt_state = priv->rtllib->rf_power_state;
-       if (priv->rtllib->PowerSaveControl.bInactivePs) {
-               if (rt_state == rf_off) {
-                       if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
-                               netdev_warn(dev, "%s(): RF is OFF.\n",
-                                           __func__);
-                               return;
-                       }
-                       mutex_lock(&priv->rtllib->ips_mutex);
-                       rtl92e_ips_leave(dev);
-                       mutex_unlock(&priv->rtllib->ips_mutex);
+       if (rt_state == rf_off) {
+               if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
+                       netdev_warn(dev, "%s(): RF is OFF.\n",
+                                   __func__);
+                       return;
                }
+               mutex_lock(&priv->rtllib->ips_mutex);
+               rtl92e_ips_leave(dev);
+               mutex_unlock(&priv->rtllib->ips_mutex);
        }
        priv->rtllib->is_set_key = true;
        if (EntryNo >= TOTAL_CAM_ENTRY) {

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 10b79003c633957c9ea64ffb2e593469b71838ac..7c0fd2bce923a1dd35739f54211b3fbe20da7218 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -886,7 +886,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->rf_change_in_progress = false;
        priv->bHwRfOffAction = 0;
        priv->SetRFPowerStateInProgress = false;
-       priv->rtllib->PowerSaveControl.bInactivePs = true;
        priv->rtllib->PowerSaveControl.bIPSModeBackup = false;
        priv->rtllib->PowerSaveControl.bLeisurePs = true;
        priv->rtllib->LPSDelayCnt = 0;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 49c50ec21d04f28c2a1e0daec0390f8c7217f654..fba86ef730b53c0f422c2390442a6fc29b442606 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -116,16 +116,14 @@ void rtl92e_ips_enter(struct net_device *dev)
                                        &(priv->rtllib->PowerSaveControl);
        enum rt_rf_power_state rt_state;
 
-       if (pPSC->bInactivePs) {
-               rt_state = priv->rtllib->rf_power_state;
-               if (rt_state == rf_on && !pPSC->bSwRfProcessing &&
-                       (priv->rtllib->state != RTLLIB_LINKED) &&
-                       (priv->rtllib->iw_mode != IW_MODE_MASTER)) {
-                       pPSC->eInactivePowerState = rf_off;
-                       priv->isRFOff = true;
-                       priv->bInPowerSaveMode = true;
-                       _rtl92e_ps_update_rf_state(dev);
-               }
+       rt_state = priv->rtllib->rf_power_state;
+       if (rt_state == rf_on && !pPSC->bSwRfProcessing &&
+               (priv->rtllib->state != RTLLIB_LINKED) &&
+               (priv->rtllib->iw_mode != IW_MODE_MASTER)) {
+               pPSC->eInactivePowerState = rf_off;
+               priv->isRFOff = true;
+               priv->bInPowerSaveMode = true;
+               _rtl92e_ps_update_rf_state(dev);
        }
 }
 
@@ -136,14 +134,12 @@ void rtl92e_ips_leave(struct net_device *dev)
                                        &(priv->rtllib->PowerSaveControl);
        enum rt_rf_power_state rt_state;
 
-       if (pPSC->bInactivePs) {
-               rt_state = priv->rtllib->rf_power_state;
-               if (rt_state != rf_on  && !pPSC->bSwRfProcessing &&
-                   priv->rtllib->rf_off_reason <= RF_CHANGE_BY_IPS) {
-                       pPSC->eInactivePowerState = rf_on;
-                       priv->bInPowerSaveMode = false;
-                       _rtl92e_ps_update_rf_state(dev);
-               }
+       rt_state = priv->rtllib->rf_power_state;
+       if (rt_state != rf_on  && !pPSC->bSwRfProcessing &&
+           priv->rtllib->rf_off_reason <= RF_CHANGE_BY_IPS) {
+               pPSC->eInactivePowerState = rf_on;
+               priv->bInPowerSaveMode = false;
+               _rtl92e_ps_update_rf_state(dev);
        }
 }
 
@@ -165,18 +161,15 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *dev)
        enum rt_rf_power_state rt_state;
 
        rt_state = priv->rtllib->rf_power_state;
-
-       if (priv->rtllib->PowerSaveControl.bInactivePs) {
-               if (rt_state == rf_off) {
-                       if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
-                               netdev_warn(dev, "%s(): RF is OFF.\n",
-                                           __func__);
-                               return;
-                       }
-                       netdev_info(dev, "=========>%s(): rtl92e_ips_leave\n",
+       if (rt_state == rf_off) {
+               if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
+                       netdev_warn(dev, "%s(): RF is OFF.\n",
                                    __func__);
-                       schedule_work(&priv->rtllib->ips_leave_wq);
+                       return;
                }
+               netdev_info(dev, "=========>%s(): rtl92e_ips_leave\n",
+                           __func__);
+               schedule_work(&priv->rtllib->ips_leave_wq);
        }
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 4920cb49e3811799cc933da7bce1d0be3b159ee5..12eea4fcb9ddeff28269beeebe448ac5de813a88 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -252,22 +252,20 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,
        mutex_lock(&priv->wx_mutex);
        if (wrqu->mode == IW_MODE_ADHOC || wrqu->mode == IW_MODE_MONITOR ||
            ieee->bNetPromiscuousMode) {
-               if (priv->rtllib->PowerSaveControl.bInactivePs) {
-                       if (rt_state == rf_off) {
-                               if (priv->rtllib->rf_off_reason >
-                                   RF_CHANGE_BY_IPS) {
-                                       netdev_warn(dev, "%s(): RF is OFF.\n",
-                                                   __func__);
-                                       mutex_unlock(&priv->wx_mutex);
-                                       return -1;
-                               }
-                               netdev_info(dev,
-                                           "=========>%s(): rtl92e_ips_leave\n",
+               if (rt_state == rf_off) {
+                       if (priv->rtllib->rf_off_reason >
+                           RF_CHANGE_BY_IPS) {
+                               netdev_warn(dev, "%s(): RF is OFF.\n",
                                            __func__);
-                               mutex_lock(&priv->rtllib->ips_mutex);
-                               rtl92e_ips_leave(dev);
-                               mutex_unlock(&priv->rtllib->ips_mutex);
+                               mutex_unlock(&priv->wx_mutex);
+                               return -1;
                        }
+                       netdev_info(dev,
+                                   "=========>%s(): rtl92e_ips_leave\n",
+                                   __func__);
+                       mutex_lock(&priv->rtllib->ips_mutex);
+                       rtl92e_ips_leave(dev);
+                       mutex_unlock(&priv->rtllib->ips_mutex);
                }
        }
        ret = rtllib_wx_set_mode(priv->rtllib, a, wrqu, b);
@@ -414,19 +412,17 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
        priv->rtllib->FirstIe_InScan = true;
 
        if (priv->rtllib->state != RTLLIB_LINKED) {
-               if (priv->rtllib->PowerSaveControl.bInactivePs) {
-                       if (rt_state == rf_off) {
-                               if (priv->rtllib->rf_off_reason >
-                                   RF_CHANGE_BY_IPS) {
-                                       netdev_warn(dev, "%s(): RF is OFF.\n",
-                                                   __func__);
-                                       mutex_unlock(&priv->wx_mutex);
-                                       return -1;
-                               }
-                               mutex_lock(&priv->rtllib->ips_mutex);
-                               rtl92e_ips_leave(dev);
-                               mutex_unlock(&priv->rtllib->ips_mutex);
+               if (rt_state == rf_off) {
+                       if (priv->rtllib->rf_off_reason >
+                           RF_CHANGE_BY_IPS) {
+                               netdev_warn(dev, "%s(): RF is OFF.\n",
+                                           __func__);
+                               mutex_unlock(&priv->wx_mutex);
+                               return -1;
                        }
+                       mutex_lock(&priv->rtllib->ips_mutex);
+                       rtl92e_ips_leave(dev);
+                       mutex_unlock(&priv->rtllib->ips_mutex);
                }
                rtllib_stop_scan(priv->rtllib);
                if (priv->rtllib->LedControlHandler)

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 40bea71bcb22cccc6f68c555c06e0931c89dc8ef..d23d1c3ce39b8afd98bda73ba3b55ef8d165d6cc 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1250,8 +1250,6 @@ enum rt_rf_power_state {
 };
 
 struct rt_pwr_save_ctrl {
-
-       bool                            bInactivePs;
        bool                            bIPSModeBackup;
        bool                            bSwRfProcessing;
        enum rt_rf_power_state eInactivePowerState;