staging: rtl8192e: remove rf_type from struct r8192_priv

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>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20230325132823.22872-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index b237970ecf851aa3825dac12e0e058a7951765ae..1eb063fe660a1e9810bbba41921d1a1fe46ba288 100644 (file)
--- 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 914cd28897a5d440868cb8249510676408182579..1e99eb833405d39b22f78ad45247a3772d030625 100644 (file)
--- 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 46be638677d949e6d8bd7cc349cae2fb5b1c6975..d458087606384302fb8544d88f989d4453f1b1b3 100644 (file)
--- 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++) {