From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 07/10] staging: rtl8192e: Remove unchanged variable bDisableNormalResetCheck
Date: Sat, 1 Oct 2022 11:41:18 +0200 [thread overview]
Message-ID: <026313f17cf708bf8fa0661f83b2c2b515e55b12.1664616227.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1664616227.git.philipp.g.hortmann@gmail.com>
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@gmail.com>
---
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
next prev parent reply other threads:[~2022-10-01 9:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 9:40 [PATCH 00/10] staging: rtl8192e: Remove unused and unchanged variables in rtl_ps.c Philipp Hortmann
2022-10-01 9:40 ` [PATCH 01/10] staging: rtl8192e: Remove unchanged variable bFwCtrlLPS Philipp Hortmann
2022-10-01 9:40 ` [PATCH 02/10] staging: rtl8192e: Remove unchanged variable bInactivePs Philipp Hortmann
2022-10-01 9:40 ` [PATCH 03/10] staging: rtl8192e: Remove unused variable bIPSModeBackup Philipp Hortmann
2022-10-01 9:40 ` [PATCH 04/10] staging: rtl8192e: Remove unused variable bInPowerSaveMode Philipp Hortmann
2022-10-01 9:41 ` [PATCH 05/10] staging: rtl8192e: Remove unused variable isRFOff Philipp Hortmann
2022-10-01 9:41 ` [PATCH 06/10] staging: rtl8192e: Remove unchanged variable RegRfOff Philipp Hortmann
2022-10-01 9:41 ` Philipp Hortmann [this message]
2022-10-01 9:41 ` [PATCH 08/10] staging: rtl8192e: Remove unused variable bForcedSilentReset Philipp Hortmann
2022-10-01 9:41 ` [PATCH 09/10] staging: rtl8192e: Remove unused variable ScanDelay Philipp Hortmann
2022-10-01 9:41 ` [PATCH 10/10] staging: rtl8192e: Remove unused variable bDriverIsGoingToUnload Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=026313f17cf708bf8fa0661f83b2c2b515e55b12.1664616227.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®