Skip to contentSkip to conversation

staging: rtl8192e: Remove enum RF_1T2R and useless cases for customer_id

PATCH New Philipp Hortmann 1 participant 7 messages Apr 2, 2023 Staging

lore
Share & tools
lore

Philipp Hortmann

author
#0 lore raw

v2 cover staging: rtl8192e: Remove enum RF_1T2R and useless cases for customer_id

Remove enum RF_1T2R as the code using it has always the same result. Remove useless cases for customer_id.

Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
---
V1->V2: Added first patch to avoid a useage of an uninitialized
variable RF_Type introduced by later patches.

Philipp Hortmann (6):
staging: rtl8192e: Remove RF_Type from
.._dm_tx_update_tssi_weak_signal
staging: rtl8192e: Remove enum RF_1T2R and RF_Type
staging: rtl8192e: Remove local variable Value and powerlevelOFDM24G
staging: rtl8192e: Remove case customer_id = RT_CID_DLINK
staging: rtl8192e: Remove case customer_id = RT_CID_819x_CAMEO, ..
staging: rtl8192e: Remove case customer_id = RT_CID_DEFAULT, ..

 .../staging/rtl8192e/rtl8192e/r8192E_dev.c    | 26 -------------------
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h |  7 -----
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h  |  5 ----
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c    | 21 +++++----------
 drivers/staging/rtl8192e/rtllib.h             |  4 ---
 5 files changed, 6 insertions(+), 57 deletions(-)
Signature · 1 line
2.40.0
author
#1 lore raw

PATCH v2 1/6 staging: rtl8192e: Remove RF_Type from .._dm_tx_update_tssi_weak_signal

Remove RF_Type from _rtl92e_dm_tx_update_tssi_weak_signal and _rtl92e_dm_tx_update_tssi_strong_signal as it is unused.

Reported-by kernel test robot <[email protected]>
Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: This patch did not exist before and was added because RF_Type
was used here but left uninitialized by later patches.

---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +4 -7
index b5f4d0230da7..258ea66ab2fd 100644
@@ -475,8 +475,7 @@ static u8	CCKSwingTable_Ch14[CCK_TABLE_LEN][8] = {
 #define		Tssi_Report_Value2			0x13e
 #define		FW_Busy_Flag				0x13f
 
-static void _rtl92e_dm_tx_update_tssi_weak_signal(struct net_device *dev,
-						  u8 RF_Type)
+static void _rtl92e_dm_tx_update_tssi_weak_signal(struct net_device *dev)
 {
 	struct r8192_priv *p = rtllib_priv(dev);
 

@@ -495,8 +494,7 @@ static void _rtl92e_dm_tx_update_tssi_weak_signal(struct net_device *dev,
 	}
 }
 
-static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev,
-						    u8 RF_Type)
+static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev)
 {
 	struct r8192_priv *p = rtllib_priv(dev);
 

@@ -610,10 +608,9 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
 				return;
 			}
 			if (Avg_TSSI_Meas_from_driver < tssi_13dBm - E_FOR_TX_POWER_TRACK)
-				_rtl92e_dm_tx_update_tssi_weak_signal(dev,
-								      RF_Type);
+				_rtl92e_dm_tx_update_tssi_weak_signal(dev);
 			else
-				_rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type);
+				_rtl92e_dm_tx_update_tssi_strong_signal(dev);
 
 			priv->cck_present_attn_diff
 				= priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
Signature · 1 line
2.40.0
author
#2 lore raw

PATCH v2 2/6 staging: rtl8192e: Remove enum RF_1T2R and RF_Type

In reply to Philipp Hortmann

enum RF_1T2R is used to initialize a local variable RF_Type that is then shifted. The result of the shift is zero. Remove code that has always the same result to increase readability.

Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: Removed declaration of local variable

---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 5 ++---
 drivers/staging/rtl8192e/rtllib.h          | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +2 -3
index 258ea66ab2fd..a21b3798db48 100644
@@ -518,7 +518,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
 	struct dcmd_txcmd tx_cmd;
 	u8	powerlevelOFDM24G;
 	int	i = 0, j = 0, k = 0;
-	u8	RF_Type, tmp_report[5] = {0, 0, 0, 0, 0};
+	u8	tmp_report[5] = {0, 0, 0, 0, 0};
 	u32	Value;
 	u8	Pwr_Flag;
 	u16	Avg_TSSI_Meas, tssi_13dBm, Avg_TSSI_Meas_from_driver = 0;

@@ -529,8 +529,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 = RF_1T2R;
-	Value = (RF_Type<<8) | powerlevelOFDM24G;
+	Value = powerlevelOFDM24G;
 
 	for (j = 0; j <= 30; j++) {
drivers/staging/rtl8192e/rtllib.h +0 -4
index 197c0a44ebd6..7d83a4c322cf 100644
@@ -433,10 +433,6 @@ enum led_ctl_mode {
 	LED_CTL_START_TO_LINK = 8,
 };
 
-enum rt_rf_type_def {
-	RF_1T2R = 0,
-};
-
 enum wireless_mode {
 	WIRELESS_MODE_UNKNOWN = 0x00,
 	WIRELESS_MODE_A = 0x01,
Signature · 1 line
2.40.0
author
#3 lore raw

PATCH v2 3/6 staging: rtl8192e: Remove local variable Value and powerlevelOFDM24G

In reply to Philipp Hortmann

powerlevelOFDM24G is set to priv->pwr_track. Then Value is set to powerlevelOFDM24G and then only once used. Remove both variables to increase readability.

Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: No changes just rebased

---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +1 -6
index a21b3798db48..cde41111012a 100644
@@ -516,10 +516,8 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
 	struct r8192_priv *priv = rtllib_priv(dev);
 	bool	viviflag = false;
 	struct dcmd_txcmd tx_cmd;
-	u8	powerlevelOFDM24G;
 	int	i = 0, j = 0, k = 0;
 	u8	tmp_report[5] = {0, 0, 0, 0, 0};
-	u32	Value;
 	u8	Pwr_Flag;
 	u16	Avg_TSSI_Meas, tssi_13dBm, Avg_TSSI_Meas_from_driver = 0;
 	u32	delta = 0;

@@ -528,14 +526,11 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
 	rtl92e_writeb(dev, FW_Busy_Flag, 0);
 	priv->rtllib->bdynamic_txpower_enable = false;
 
-	powerlevelOFDM24G = priv->pwr_track >> 24;
-	Value = powerlevelOFDM24G;
-
 	for (j = 0; j <= 30; j++) {
 
 		tx_cmd.op	= TXCMD_SET_TX_PWR_TRACKING;
 		tx_cmd.length	= 4;
-		tx_cmd.value	= Value;
+		tx_cmd.value	= priv->pwr_track >> 24;
 		rtl92e_send_cmd_pkt(dev, DESC_PACKET_TYPE_NORMAL, (u8 *)&tx_cmd,
 				    sizeof(struct dcmd_txcmd));
 		mdelay(1);
Signature · 1 line
2.40.0
author
#4 lore raw

PATCH v2 4/6 staging: rtl8192e: Remove case customer_id = RT_CID_DLINK

In reply to Philipp Hortmann

customer_id is initialize to zero. Changing customer_id to RT_CID_DLINK would not change the program execution as there is no equation for RT_CID_DLINK. Remove useless code lines to increase readability.

Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: No changes

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 ------
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h  | 1 -
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h   | 1 -
 3 files changed, 8 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -6
index 1da14e737aa4..cbe66b4a6ad9 100644
@@ -431,9 +431,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 	else
 		priv->chnl_plan = priv->reg_chnl_plan;
 
-	if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
-		priv->customer_id =  RT_CID_DLINK;
-
 	switch (priv->eeprom_customer_id) {
 	case EEPROM_CID_DEFAULT:
 		priv->customer_id = RT_CID_DEFAULT;

@@ -460,9 +457,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 	case EEPROM_CID_Pronet:
 		priv->customer_id = RT_CID_PRONET;
 		break;
-	case EEPROM_CID_DLINK:
-		priv->customer_id = RT_CID_DLINK;
-		break;
 
 	case EEPROM_CID_WHQL:
 		break;
drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +0 -1
index 99640c4779f7..706d024bcfd1 100644
@@ -37,7 +37,6 @@ enum baseband_config {
 #define EEPROM_CID_NetCore				0x5
 #define EEPROM_CID_Nettronix			0x6
 #define EEPROM_CID_Pronet				0x7
-#define EEPROM_CID_DLINK				0x8
 #define EEPROM_CID_WHQL					0xFE
 enum _RTL8192PCI_HW {
 	MAC0			= 0x000,
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
index 1e99eb833405..91d634f5d3e7 100644
@@ -134,7 +134,6 @@ enum rt_customer_id {
 	RT_CID_TOSHIBA	  = 9,
 	RT_CID_819X_NETCORE     = 10,
 	RT_CID_Nettronix	= 11,
-	RT_CID_DLINK	    = 12,
 	RT_CID_PRONET	   = 13,
 };
Signature · 1 line
2.40.0
author
#5 lore raw

PATCH v2 5/6 staging: rtl8192e: Remove case customer_id = RT_CID_819x_CAMEO, ..

In reply to Philipp Hortmann

customer_id is initialize to zero. Changing customer_id to RT_CID_819x_CAMEO, RT_CID_819x_RUNTOP, RT_CID_Nettronix or RT_CID_PRONET would not change the program execution as there is no equation for RT_CID_819x_CAMEO, RT_CID_819x_RUNTOP, RT_CID_Nettronix or RT_CID_PRONET. Remove useless code lines to increase readability.

Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: No changes

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 ------------
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h  |  4 ----
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h   |  4 ----
 3 files changed, 20 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -12
index cbe66b4a6ad9..df8de35cbe0e 100644
@@ -435,12 +435,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 	case EEPROM_CID_DEFAULT:
 		priv->customer_id = RT_CID_DEFAULT;
 		break;
-	case EEPROM_CID_CAMEO:
-		priv->customer_id = RT_CID_819x_CAMEO;
-		break;
-	case  EEPROM_CID_RUNTOP:
-		priv->customer_id = RT_CID_819x_RUNTOP;
-		break;
 	case EEPROM_CID_NetCore:
 		priv->customer_id = RT_CID_819X_NETCORE;
 		break;

@@ -451,12 +445,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 		else
 			priv->chnl_plan = 0x0;
 		break;
-	case EEPROM_CID_Nettronix:
-		priv->customer_id = RT_CID_Nettronix;
-		break;
-	case EEPROM_CID_Pronet:
-		priv->customer_id = RT_CID_PRONET;
-		break;
 
 	case EEPROM_CID_WHQL:
 		break;
drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +0 -4
index 706d024bcfd1..4ee78b7a558e 100644
@@ -31,12 +31,8 @@ enum baseband_config {
 #define EEPROM_TxPwIndex_OFDM_24G	0x3A
 
 #define EEPROM_CID_DEFAULT			0x0
-#define EEPROM_CID_CAMEO				0x1
-#define EEPROM_CID_RUNTOP				0x2
 #define EEPROM_CID_TOSHIBA				0x4
 #define EEPROM_CID_NetCore				0x5
-#define EEPROM_CID_Nettronix			0x6
-#define EEPROM_CID_Pronet				0x7
 #define EEPROM_CID_WHQL					0xFE
 enum _RTL8192PCI_HW {
 	MAC0			= 0x000,
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -4
index 91d634f5d3e7..2b2d8af4cf6e 100644
@@ -129,12 +129,8 @@ enum dcmg_txcmd_op {
 
 enum rt_customer_id {
 	RT_CID_DEFAULT	  = 0,
-	RT_CID_819x_CAMEO       = 6,
-	RT_CID_819x_RUNTOP      = 7,
 	RT_CID_TOSHIBA	  = 9,
 	RT_CID_819X_NETCORE     = 10,
-	RT_CID_Nettronix	= 11,
-	RT_CID_PRONET	   = 13,
 };
 
 enum reset_type {
Signature · 1 line
2.40.0
author
#6 lore raw

PATCH v2 6/6 staging: rtl8192e: Remove case customer_id = RT_CID_DEFAULT, ..

In reply to Philipp Hortmann

customer_id is initialize to zero. Changing customer_id to RT_CID_DEFAULT will not change customer_id as it is already zero. default and EEPROM_CID_WHQL contain only a break. Remove useless code lines to increase readability.

Signed-off-by Philipp Hortmann <[email protected]>

---
V1->V2: No changes

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 --------
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h  | 2 --
 2 files changed, 10 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -8
index df8de35cbe0e..aed53fedeb61 100644
@@ -432,9 +432,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 		priv->chnl_plan = priv->reg_chnl_plan;
 
 	switch (priv->eeprom_customer_id) {
-	case EEPROM_CID_DEFAULT:
-		priv->customer_id = RT_CID_DEFAULT;
-		break;
 	case EEPROM_CID_NetCore:
 		priv->customer_id = RT_CID_819X_NETCORE;
 		break;

@@ -445,11 +442,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 		else
 			priv->chnl_plan = 0x0;
 		break;
-
-	case EEPROM_CID_WHQL:
-		break;
-	default:
-		break;
 	}
 
 	if (priv->chnl_plan > CHANNEL_PLAN_LEN - 1)
drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +0 -2
index 4ee78b7a558e..f4d4b01630a2 100644
@@ -30,10 +30,8 @@ enum baseband_config {
 #define EEPROM_TxPwIndex_CCK			0x2C
 #define EEPROM_TxPwIndex_OFDM_24G	0x3A
 
-#define EEPROM_CID_DEFAULT			0x0
 #define EEPROM_CID_TOSHIBA				0x4
 #define EEPROM_CID_NetCore				0x5
-#define EEPROM_CID_WHQL					0xFE
 enum _RTL8192PCI_HW {
 	MAC0			= 0x000,
 	MAC4			= 0x004,
Signature · 1 line
2.40.0