From: John Whitmore <johnfwhitmore@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
John Whitmore <johnfwhitmore@gmail.com>
Subject: [PATCH 02/18] staging:rtl8192u: Remove member variable rx_gain_range_max - Style
Date: Fri, 3 Aug 2018 01:01:55 +0100 [thread overview]
Message-ID: <20180803000211.10589-3-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180803000211.10589-1-johnfwhitmore@gmail.com>
The structure 'dig' defines a member variable, (rx_gain_range_max)
which is initialised to the value 'DM_DIG_MAX', (a defined constant).
The variable is then used to test and set another variable. Since
the member rx_gain_range_max is never assigned any other value then
the constant 'DM_DIG_MAX' the code might as well simply use that
constant, rather the a member variable set to that constant.
The member variable has been removed and the constant used directly
in the code. This is a coding style change which should not impact
runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/r8192U_dm.c | 5 ++---
drivers/staging/rtl8192u/r8192U_dm.h | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 3336798310ac..8b9d011e9eec 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -1650,7 +1650,6 @@ static void dm_dig_init(struct net_device *dev)
dm_digtable.rssi_val = 50; /* for new dig debug rssi value */
dm_digtable.backoff_val = DM_DIG_BACKOFF;
- dm_digtable.rx_gain_range_max = DM_DIG_MAX;
if (priv->CustomerID == RT_CID_819x_Netcore)
dm_digtable.rx_gain_range_min = DM_DIG_MIN_Netcore;
else
@@ -1968,8 +1967,8 @@ static void dm_initial_gain(
if (dm_digtable.pre_connect_state == dm_digtable.cur_connect_state) {
if (dm_digtable.cur_connect_state == DIG_CONNECT) {
- if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) > dm_digtable.rx_gain_range_max)
- dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max;
+ if ((dm_digtable.rssi_val + 10 - dm_digtable.backoff_val) > DM_DIG_MAX)
+ dm_digtable.cur_ig_value = DM_DIG_MAX;
else if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_min;
else
diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h
index bc736f2f5a5c..f3e3db18fdd0 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.h
+++ b/drivers/staging/rtl8192u/r8192U_dm.h
@@ -118,7 +118,6 @@ struct dig {
u32 cur_ig_value;
u8 backoff_val;
- u8 rx_gain_range_max;
u8 rx_gain_range_min;
bool initialgain_lowerbound_state;
--
2.18.0
next prev parent reply other threads:[~2018-08-03 0:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 0:01 [PATCH 00/18] staging:rtl8192u: Clean up ofr8192U_dm.h John Whitmore
2018-08-03 0:01 ` [PATCH 01/18] staging:rtl8192u: Remove debug member from structures - Style John Whitmore
2018-08-03 0:01 ` John Whitmore [this message]
2018-08-03 0:01 ` [PATCH 03/18] staging:rtl8192u: Remove member initialgain_lowerbound_state " John Whitmore
2018-08-03 0:01 ` [PATCH 04/18] staging:rtl8192u: Rename enum constants " John Whitmore
2018-08-03 0:01 ` [PATCH 05/18] staging:rtl8192u: Remove unused extern DM_RxPathSelTable " John Whitmore
2018-08-03 0:01 ` [PATCH 06/18] staging:rtl8192u: Remove member variable Enable " John Whitmore
2018-08-03 0:02 ` [PATCH 07/18] staging:rtl8192u: Rename cck_Rx_path " John Whitmore
2018-08-03 0:02 ` [PATCH 08/18] staging:rtl8192u: Remove SS_TH_low " John Whitmore
2018-08-03 0:02 ` [PATCH 09/18] staging:rtl8192u: Remove member diff_TH " John Whitmore
2018-08-03 0:02 ` [PATCH 10/18] staging:rtl8192u: Rename member disabledRF " John Whitmore
2018-08-03 0:02 ` [PATCH 11/18] staging:rtl8192u: Remove member reserved " John Whitmore
2018-08-03 0:02 ` [PATCH 12/18] staging:rtl8192u: Refactor DCMD_TXCMD_T structure " John Whitmore
2018-08-03 0:02 ` [PATCH 13/18] staging:rtl8192u: Rename DM_DIG_MIN_Netcore " John Whitmore
2018-08-03 0:02 ` [PATCH 14/18] staging:rtl8192u: Rename RateAdaptiveTH_High " John Whitmore
2018-08-03 0:02 ` [PATCH 15/18] staging:rtl8192u: Rename constants RateAdaptiveTH_Low_* " John Whitmore
2018-08-03 0:02 ` [PATCH 16/18] staging:rtl8192u: Rename constants " John Whitmore
2018-08-03 0:02 ` [PATCH 17/18] staging:rtl8192u: Rename Register Constants " John Whitmore
2018-08-03 0:02 ` [PATCH 18/18] staging:rtl8192u: Clean up of spacing " John Whitmore
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=20180803000211.10589-3-johnfwhitmore@gmail.com \
--to=johnfwhitmore@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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