[PATCH 07/10] staging: rtl8192e: Remove unchanged variable bDisableNormalResetCheck

From: Philipp Hortmann
Date: Sat Oct 01 2022 - 05:42:01 EST


bDisableNormalResetCheck is just once initialized with false. All
evaluations will result in !false. Remove resulting dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++----
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index e77a73df9bc5..9dcae5d71fb9 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -871,7 +871,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
priv->ScanDelay = 50;
priv->ResetProgress = RESET_TYPE_NORESET;
priv->bForcedSilentReset = false;
- priv->bDisableNormalResetCheck = false;
priv->force_reset = false;
memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);

@@ -1403,13 +1402,12 @@ static void _rtl92e_watchdog_wq_cb(void *data)
}
spin_unlock_irqrestore(&priv->tx_lock, flags);

- if (!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL) {
+ if (ResetType == RESET_TYPE_NORMAL) {
priv->ResetProgress = RESET_TYPE_NORMAL;
return;
}

- if (((priv->force_reset) || (!priv->bDisableNormalResetCheck &&
- ResetType == RESET_TYPE_SILENT)))
+ if ((priv->force_reset || ResetType == RESET_TYPE_SILENT))
_rtl92e_if_silent_reset(dev);
priv->force_reset = false;
priv->bForcedSilentReset = false;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 7d716fa12995..8a24037a93ec 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -541,7 +541,6 @@ struct r8192_priv {

enum reset_type ResetProgress;
bool bForcedSilentReset;
- bool bDisableNormalResetCheck;
u16 TxCounter;
u16 RxCounter;
bool bResetInProgress;
--
2.37.3