From: Philipp Hortmann Date: Sat, 1 Oct 2022 09:41:18 +0000 (+0200) Subject: staging: rtl8192e: Remove unchanged variable bDisableNormalResetCheck X-Git-Tag: microblaze-v6.6~1513^2~243 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ec437736505f4ba1152730d8c0ec3d0167bb358b;p=linux-2.6-microblaze.git staging: rtl8192e: Remove unchanged variable bDisableNormalResetCheck bDisableNormalResetCheck is just once initialized with false. All evaluations will result in !false. Remove resulting dead code. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/026313f17cf708bf8fa0661f83b2c2b515e55b12.1664616227.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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;