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 06/11] staging: rtl8192e: Remove unused variable reset_in_progress
Date: Sun, 1 Oct 2023 15:44:54 +0200 [thread overview]
Message-ID: <25259d69b955472a74725f3665238fb6daee76b4.1696165351.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1696165351.git.philipp.g.hortmann@gmail.com>
priv->reset_in_progress is set to false and never changed. All
equations result accordingly. Remove 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 -
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 5 -----
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 7ca6a04d034c..9da858510211 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1132,7 +1132,6 @@ static void _rtl92e_watchdog_wq_cb(void *data)
spin_unlock_irqrestore(&priv->tx_lock, flags);
priv->force_reset = false;
- priv->reset_in_progress = false;
}
static void _rtl92e_watchdog_timer_cb(struct timer_list *t)
@@ -1218,8 +1217,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index;
- if ((priv->rtllib->rf_power_state == rf_off) || !priv->up ||
- priv->reset_in_progress) {
+ if ((priv->rtllib->rf_power_state == rf_off) || !priv->up) {
kfree_skb(skb);
return;
}
@@ -1252,7 +1250,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (queue_index != TXCMD_QUEUE) {
if ((priv->rtllib->rf_power_state == rf_off) ||
- !priv->up || priv->reset_in_progress) {
+ !priv->up) {
kfree_skb(skb);
return 0;
}
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 855bee78c674..fa5d0eec90d3 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -372,7 +372,6 @@ struct r8192_priv {
u16 tx_counter;
u16 rx_ctr;
- bool reset_in_progress;
bool force_reset;
bool force_lps;
};
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 561ea68de56a..fd5228e7a462 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -530,11 +530,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
if (Pwr_Flag == 0) {
mdelay(1);
- if (priv->reset_in_progress) {
- rtl92e_writeb(dev, Pw_Track_Flag, 0);
- rtl92e_writeb(dev, FW_Busy_Flag, 0);
- return;
- }
if (priv->rtllib->rf_power_state != rf_on) {
rtl92e_writeb(dev, Pw_Track_Flag, 0);
rtl92e_writeb(dev, FW_Busy_Flag, 0);
--
2.42.0
next prev parent reply other threads:[~2023-10-01 13:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 13:43 [PATCH 00/11] staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset() Philipp Hortmann
2023-10-01 13:43 ` [PATCH 01/11] staging: rtl8192e: Remove ibss_maxjoin_chal Philipp Hortmann
2023-10-01 13:44 ` [PATCH 02/11] staging: rtl8192e: Remove dead code from _rtl92e_if_check_reset() Philipp Hortmann
2023-10-01 13:44 ` [PATCH 03/11] staging: rtl8192e: Remove RESET_TYPE_NORMAL Philipp Hortmann
2023-10-01 13:44 ` [PATCH 04/11] staging: rtl8192e: Remove broken function _rtl92e_if_silent_reset() Philipp Hortmann
2023-10-01 13:44 ` [PATCH 05/11] staging: rtl8192e: Remove unused variable rst_progress Philipp Hortmann
2023-10-01 13:44 ` Philipp Hortmann [this message]
2023-10-01 13:44 ` [PATCH 07/11] staging: rtl8192e: Remove unused parameter from _rtl92e_sta_up() Philipp Hortmann
2023-10-01 13:45 ` [PATCH 08/11] staging: rtl8192e: Remove unused parameter from _rtl92e_up() Philipp Hortmann
2023-10-01 13:45 ` [PATCH 09/11] staging: rtl8192e: Remove unused variable is_silent_reset Philipp Hortmann
2023-10-01 13:45 ` [PATCH 10/11] staging: rtl8192e: Remove unused variables priv->reset_count and reset_cnt Philipp Hortmann
2023-10-01 13:45 ` [PATCH 11/11] staging: rtl8192e: Remove r8192_private_handler _rtl92e_wx_force_reset() 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=25259d69b955472a74725f3665238fb6daee76b4.1696165351.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®