linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 05/10] staging: rtl8192e: Remove variable ht_info->reg_short_gi_40mhz
Date: Sun, 10 Dec 2023 16:26:30 +0100	[thread overview]
Message-ID: <255039e0cb27582a98a0b86340dfe88f14c08a76.1702212003.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1702212003.git.philipp.g.hortmann@gmail.com>

ht_info->reg_short_gi_40mhz is set to 1 and unchanged. Therefore all
equations result accordingly and ht_info->reg_short_gi_40mhz can be
removed.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
 drivers/staging/rtl8192e/rtl819x_HT.h     | 1 -
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 8a4bd389004a..0664eb86bada 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -95,7 +95,6 @@ struct rt_hi_throughput {
 	u8 enable_ht;
 	u8 current_ht_support;
 	u8 cur_bw_40mhz;
-	u8 reg_short_gi_40mhz;
 	u8 cur_short_gi_40mhz;
 	u8 cur_short_gi_20mhz;
 	u8 bCurSuppCCK;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index ed9b3db1a393..0a5885d6c0a0 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -71,8 +71,6 @@ void ht_update_default_setting(struct rtllib_device *ieee)
 {
 	struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-	ht_info->reg_short_gi_40mhz = 1;
-
 	ht_info->amsdu_max_size = 7935UL;
 	ht_info->amsdu_support = 0;
 
@@ -471,9 +469,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
 				 true : false);
 
 	ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
-	ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ?
-				     ((pPeerHTCap->ShortGI40Mhz == 1) ?
-				     true : false) : false);
+	ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false);
 
 	ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false);
 
-- 
2.43.0


  parent reply	other threads:[~2023-12-10 15:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-10 15:25 [PATCH 00/10] staging: rtl8192e: Remove variable reg_bw_40mhz and further Philipp Hortmann
2023-12-10 15:25 ` [PATCH 01/10] staging: rtl8192e: Remove unused struct iw_range_with_scan_capa Philipp Hortmann
2023-12-10 15:26 ` [PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz Philipp Hortmann
2023-12-10 15:26 ` [PATCH 03/10] staging: rtl8192e: Remove variable ht_info->reg_supp_cck Philipp Hortmann
2023-12-10 15:26 ` [PATCH 04/10] staging: rtl8192e: Remove variable ht_info->reg_short_gi_20mhz Philipp Hortmann
2023-12-10 15:26 ` Philipp Hortmann [this message]
2023-12-10 15:26 ` [PATCH 06/10] staging: rtl8192e: Remove variable ForcedAMPDUMode Philipp Hortmann
2023-12-10 15:26 ` [PATCH 07/10] staging: rtl8192e: Remove variable ForcedAMSDUMode Philipp Hortmann
2023-12-10 15:26 ` [PATCH 08/10] staging: rtl8192e: Remove equation with pPeerHTCap->DssCCk Philipp Hortmann
2023-12-10 15:26 ` [PATCH 09/10] staging: rtl8192e: Remove variable ht_info->bCurSuppCCK Philipp Hortmann
2023-12-10 15:27 ` [PATCH 10/10] staging: rtl8192e: Remove struct ht_info_ele SelfHTInfo 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=255039e0cb27582a98a0b86340dfe88f14c08a76.1702212003.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;
as well as URLs for NNTP newsgroup(s).