* [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv
@ 2023-03-25 13:28 Michael Straube
2023-03-25 13:28 ` [PATCH 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE Michael Straube
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Michael Straube @ 2023-03-25 13:28 UTC (permalink / raw)
To: gregkh; +Cc: philipp.g.hortmann, linux-staging, linux-kernel, Michael Straube
This series removes the rf_type field from the r8192_priv structure.
RF type is always RF_1T2R, so we do not need to store it in an extra
variable.
I don't have any hardware to test this, so compile-tested only.
Michael Straube (4):
staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE
staging: rtl8192e: remove redundant setting of rf_type
staging: rtl8192e: priv->rf_type is always RF_1T2R
staging: rtl8192e: remove rf_type from struct r8192_priv
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 19 +++-----------
.../staging/rtl8192e/rtl8192e/r8192E_phy.c | 7 ++----
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 ---
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 25 +++++++------------
4 files changed, 15 insertions(+), 39 deletions(-)
--
2.40.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
@ 2023-03-25 13:28 ` Michael Straube
2023-03-25 13:28 ` [PATCH 2/4] staging: rtl8192e: remove redundant setting of rf_type Michael Straube
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2023-03-25 13:28 UTC (permalink / raw)
To: gregkh; +Cc: philipp.g.hortmann, linux-staging, linux-kernel, Michael Straube
Remove RTL819X_DEFAULT_RF_TYPE and use RF_1T2R directly to make
follow up patches, which will remove priv->rf_type, easier to review.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index a67927f0c5e3..3027d43cb362 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -343,7 +343,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
else
priv->tx_pwr_data_read_from_eeprom = false;
- priv->rf_type = RTL819X_DEFAULT_RF_TYPE;
+ priv->rf_type = RF_1T2R;
if (priv->card_8192_version > VERSION_8190_BD) {
if (!priv->autoload_fail_flag) {
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 68ec0aeb2dd9..914cd28897a5 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -61,8 +61,6 @@
#define HAL_HW_PCI_REVISION_ID_8192PCIE 0x01
#define HAL_HW_PCI_REVISION_ID_8192SE 0x10
-#define RTL819X_DEFAULT_RF_TYPE RF_1T2R
-
#define RTLLIB_WATCH_DOG_TIME 2000
#define MAX_DEV_ADDR_SIZE 8 /*support till 64 bit bus width OS*/
--
2.40.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] staging: rtl8192e: remove redundant setting of rf_type
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
2023-03-25 13:28 ` [PATCH 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE Michael Straube
@ 2023-03-25 13:28 ` Michael Straube
2023-03-25 13:28 ` [PATCH 3/4] staging: rtl8192e: priv->rf_type is always RF_1T2R Michael Straube
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2023-03-25 13:28 UTC (permalink / raw)
To: gregkh; +Cc: philipp.g.hortmann, linux-staging, linux-kernel, Michael Straube
At this point the value of priv->rf_type is RF_1T2R already. Setting
it again is redundant and can be removed.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 3027d43cb362..0e0096ef4943 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -350,10 +350,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
tempval = (rtl92e_eeprom_read(dev,
(EEPROM_RFInd_PowerDiff >> 1))) & 0xff;
priv->eeprom_legacy_ht_tx_pwr_diff = tempval & 0xf;
-
- if (tempval&0x80)
- priv->rf_type = RF_1T2R;
-
} else {
priv->eeprom_legacy_ht_tx_pwr_diff = 0x04;
}
--
2.40.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] staging: rtl8192e: priv->rf_type is always RF_1T2R
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
2023-03-25 13:28 ` [PATCH 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE Michael Straube
2023-03-25 13:28 ` [PATCH 2/4] staging: rtl8192e: remove redundant setting of rf_type Michael Straube
@ 2023-03-25 13:28 ` Michael Straube
2023-03-25 13:28 ` [PATCH 4/4] staging: rtl8192e: remove rf_type from struct r8192_priv Michael Straube
2023-03-25 19:05 ` [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Philipp Hortmann
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2023-03-25 13:28 UTC (permalink / raw)
To: gregkh; +Cc: philipp.g.hortmann, linux-staging, linux-kernel, Michael Straube
The value of priv->rf_type is always RF_1T2R. Remove if statements
that check for priv->rf_type == RF_1T2R and remove resulting dead
code.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 13 ++++-------
.../staging/rtl8192e/rtl8192e/r8192E_phy.c | 7 ++----
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 23 +++++++------------
3 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 0e0096ef4943..b237970ecf85 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -540,8 +540,7 @@ static void _rtl92e_hwconfig(struct net_device *dev)
u32 ratr_value;
ratr_value = regRATR;
- if (priv->rf_type == RF_1T2R)
- ratr_value &= ~(RATE_ALL_OFDM_2SS);
+ ratr_value &= ~(RATE_ALL_OFDM_2SS);
rtl92e_writel(dev, RATR0, ratr_value);
rtl92e_writeb(dev, UFWP, 1);
}
@@ -1886,14 +1885,10 @@ void rtl92e_update_ratr_table(struct net_device *dev)
break;
case IEEE_N_24G:
case IEEE_N_5G:
- if (ieee->ht_info->peer_mimo_ps == 0) {
+ if (ieee->ht_info->peer_mimo_ps == 0)
ratr_value &= 0x0007F007;
- } else {
- if (priv->rf_type == RF_1T2R)
- ratr_value &= 0x000FF007;
- else
- ratr_value &= 0x0F81F007;
- }
+ else
+ ratr_value &= 0x000FF007;
break;
default:
break;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index b1c297d2ae36..bd302f5cb356 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -281,14 +281,11 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)
u32 *Rtl819XPHY_REGArray_Table = NULL;
u32 *Rtl819XAGCTAB_Array_Table = NULL;
u16 AGCTAB_ArrayLen, PHY_REGArrayLen = 0;
- struct r8192_priv *priv = rtllib_priv(dev);
AGCTAB_ArrayLen = RTL8192E_AGCTAB_ARR_LEN;
Rtl819XAGCTAB_Array_Table = RTL8192E_AGCTAB_ARR;
- if (priv->rf_type == RF_1T2R) {
- PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN;
- Rtl819XPHY_REGArray_Table = RTL8192E_PHY_REG_1T2R_ARR;
- }
+ PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN;
+ Rtl819XPHY_REGArray_Table = RTL8192E_PHY_REG_1T2R_ARR;
if (ConfigType == BB_CONFIG_PHY_REG) {
for (i = 0; i < PHY_REGArrayLen; i += 2) {
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index b745b73eedea..46be638677d9 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -272,19 +272,14 @@ void rtl92e_init_adaptive_rate(struct net_device *dev)
pra->ping_rssi_enable = 0;
pra->ping_rssi_thresh_for_ra = 15;
-
- if (priv->rf_type == RF_1T2R) {
- pra->upper_rssi_threshold_ratr = 0x000fc000;
- pra->middle_rssi_threshold_ratr = 0x000ff000;
- pra->low_rssi_threshold_ratr = 0x000ff001;
- pra->low_rssi_threshold_ratr_40M = 0x000ff005;
- pra->low_rssi_threshold_ratr_20M = 0x000ff001;
- pra->ping_rssi_ratr = 0x0000000d;
- }
-
+ pra->upper_rssi_threshold_ratr = 0x000fc000;
+ pra->middle_rssi_threshold_ratr = 0x000ff000;
+ pra->low_rssi_threshold_ratr = 0x000ff001;
+ pra->low_rssi_threshold_ratr_40M = 0x000ff005;
+ pra->low_rssi_threshold_ratr_20M = 0x000ff001;
+ pra->ping_rssi_ratr = 0x0000000d;
}
-
static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -383,8 +378,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
u32 ratr_value;
ratr_value = targetRATR;
- if (priv->rf_type == RF_1T2R)
- ratr_value &= ~(RATE_ALL_OFDM_2SS);
+ ratr_value &= ~(RATE_ALL_OFDM_2SS);
rtl92e_writel(dev, RATR0, ratr_value);
rtl92e_writeb(dev, UFWP, 1);
@@ -981,8 +975,7 @@ void rtl92e_dm_restore_state(struct net_device *dev)
priv->rtllib->mode == WIRELESS_MODE_N_5G))
return;
ratr_value = reg_ratr;
- if (priv->rf_type == RF_1T2R)
- ratr_value &= ~(RATE_ALL_OFDM_2SS);
+ ratr_value &= ~(RATE_ALL_OFDM_2SS);
rtl92e_writel(dev, RATR0, ratr_value);
rtl92e_writeb(dev, UFWP, 1);
if (priv->tx_pwr_tracking_init && priv->btxpower_tracking)
--
2.40.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] staging: rtl8192e: remove rf_type from struct r8192_priv
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
` (2 preceding siblings ...)
2023-03-25 13:28 ` [PATCH 3/4] staging: rtl8192e: priv->rf_type is always RF_1T2R Michael Straube
@ 2023-03-25 13:28 ` Michael Straube
2023-03-25 19:05 ` [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Philipp Hortmann
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2023-03-25 13:28 UTC (permalink / raw)
To: gregkh; +Cc: philipp.g.hortmann, linux-staging, linux-kernel, Michael Straube
The field rf_type of struct r8192_priv is always RF_1T2R and only used
in one place. Use RF_1T2R directly there and remove rf_type from struct
r8192_priv.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 --
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 -
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index b237970ecf85..1eb063fe660a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -343,8 +343,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
else
priv->tx_pwr_data_read_from_eeprom = false;
- priv->rf_type = RF_1T2R;
-
if (priv->card_8192_version > VERSION_8190_BD) {
if (!priv->autoload_fail_flag) {
tempval = (rtl92e_eeprom_read(dev,
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 914cd28897a5..1e99eb833405 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -289,7 +289,6 @@ struct r8192_priv {
enum nic_t card_8192;
u8 card_8192_version;
- u8 rf_type;
u8 ic_cut;
char nick[IW_ESSID_MAX_SIZE + 1];
u8 check_roaming_cnt;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 46be638677d9..d45808760638 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -532,7 +532,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
priv->rtllib->bdynamic_txpower_enable = false;
powerlevelOFDM24G = priv->pwr_track >> 24;
- RF_Type = priv->rf_type;
+ RF_Type = RF_1T2R;
Value = (RF_Type<<8) | powerlevelOFDM24G;
for (j = 0; j <= 30; j++) {
--
2.40.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
` (3 preceding siblings ...)
2023-03-25 13:28 ` [PATCH 4/4] staging: rtl8192e: remove rf_type from struct r8192_priv Michael Straube
@ 2023-03-25 19:05 ` Philipp Hortmann
4 siblings, 0 replies; 6+ messages in thread
From: Philipp Hortmann @ 2023-03-25 19:05 UTC (permalink / raw)
To: Michael Straube, gregkh; +Cc: linux-staging, linux-kernel
On 3/25/23 14:28, Michael Straube wrote:
> This series removes the rf_type field from the r8192_priv structure.
> RF type is always RF_1T2R, so we do not need to store it in an extra
> variable.
>
> I don't have any hardware to test this, so compile-tested only.
>
> Michael Straube (4):
> staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE
> staging: rtl8192e: remove redundant setting of rf_type
> staging: rtl8192e: priv->rf_type is always RF_1T2R
> staging: rtl8192e: remove rf_type from struct r8192_priv
>
> .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 19 +++-----------
> .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 7 ++----
> drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 ---
> drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 25 +++++++------------
> 4 files changed, 15 insertions(+), 39 deletions(-)
>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-25 19:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-25 13:28 [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Michael Straube
2023-03-25 13:28 ` [PATCH 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE Michael Straube
2023-03-25 13:28 ` [PATCH 2/4] staging: rtl8192e: remove redundant setting of rf_type Michael Straube
2023-03-25 13:28 ` [PATCH 3/4] staging: rtl8192e: priv->rf_type is always RF_1T2R Michael Straube
2023-03-25 13:28 ` [PATCH 4/4] staging: rtl8192e: remove rf_type from struct r8192_priv Michael Straube
2023-03-25 19:05 ` [PATCH 0/4] staging: rtl8192e: remove rf_type from r8192_priv Philipp Hortmann
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).