Skip to contentSkip to conversation

Trivial code cleanup patches

PATCH In review Yogesh Hegde 2 participants 7 messages Jul 2, 2023 – Jul 8, 2023 Staging

lore
Share & tools
lore

Yogesh Hegde

author
#0 lore raw

cover Trivial code cleanup patches

Rename variables in function _rtl92e_dm_check_rate_adaptive to avoid checkpatch complains.

The patches are required to be applied in sequence.

Yogesh Hegde (4):
staging: rtl8192e: Rename variable currentRATR
staging: rtl8192e: Rename variable targetRATR
staging: rtl8192e: Rename variable LowRSSIThreshForRA
staging: rtl8192e: Rename variable HighRSSIThreshForRA

 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/4 staging: rtl8192e: Rename variable currentRATR

Rename variable currentRATR to current_ratr to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by Yogesh Hegde <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +3 -3
index 37c275cac40b..14c78f740366 100644
@@ -277,7 +277,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 	struct r8192_priv *priv = rtllib_priv(dev);
 	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;
 	struct rate_adaptive *pra = &priv->rate_adaptive;
-	u32 currentRATR, targetRATR = 0;
+	u32 current_ratr, targetRATR = 0;
 	u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
 	bool bshort_gi_enabled = false;
 	static u8 ping_rssi_state;

@@ -363,8 +363,8 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 		if (priv->rtllib->GetHalfNmodeSupportByAPsHandler(dev))
 			targetRATR &=  0xf00fffff;
 
-		currentRATR = rtl92e_readl(dev, RATR0);
-		if (targetRATR !=  currentRATR) {
+		current_ratr = rtl92e_readl(dev, RATR0);
+		if (targetRATR !=  current_ratr) {
 			u32 ratr_value;
 
 			ratr_value = targetRATR;
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/4 staging: rtl8192e: Rename variable targetRATR

In reply to Yogesh Hegde

Rename variable targetRATR to target_ratr to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by Yogesh Hegde <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +9 -9
index 14c78f740366..a535a63ce9f7 100644
@@ -277,7 +277,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 	struct r8192_priv *priv = rtllib_priv(dev);
 	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;
 	struct rate_adaptive *pra = &priv->rate_adaptive;
-	u32 current_ratr, targetRATR = 0;
+	u32 current_ratr, target_ratr = 0;
 	u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
 	bool bshort_gi_enabled = false;
 	static u8 ping_rssi_state;

@@ -335,14 +335,14 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 		if (priv->undecorated_smoothed_pwdb >=
 		    (long)HighRSSIThreshForRA) {
 			pra->ratr_state = DM_RATR_STA_HIGH;
-			targetRATR = pra->upper_rssi_threshold_ratr;
+			target_ratr = pra->upper_rssi_threshold_ratr;
 		} else if (priv->undecorated_smoothed_pwdb >=
 			   (long)LowRSSIThreshForRA) {
 			pra->ratr_state = DM_RATR_STA_MIDDLE;
-			targetRATR = pra->middle_rssi_threshold_ratr;
+			target_ratr = pra->middle_rssi_threshold_ratr;
 		} else {
 			pra->ratr_state = DM_RATR_STA_LOW;
-			targetRATR = pra->low_rssi_threshold_ratr;
+			target_ratr = pra->low_rssi_threshold_ratr;
 		}
 
 		if (pra->ping_rssi_enable) {

@@ -352,7 +352,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 				     (long)pra->ping_rssi_thresh_for_ra) ||
 				    ping_rssi_state) {
 					pra->ratr_state = DM_RATR_STA_LOW;
-					targetRATR = pra->ping_rssi_ratr;
+					target_ratr = pra->ping_rssi_ratr;
 					ping_rssi_state = 1;
 				}
 			} else {

@@ -361,18 +361,18 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 		}
 
 		if (priv->rtllib->GetHalfNmodeSupportByAPsHandler(dev))
-			targetRATR &=  0xf00fffff;
+			target_ratr &=  0xf00fffff;
 
 		current_ratr = rtl92e_readl(dev, RATR0);
-		if (targetRATR !=  current_ratr) {
+		if (target_ratr !=  current_ratr) {
 			u32 ratr_value;
 
-			ratr_value = targetRATR;
+			ratr_value = target_ratr;
 			ratr_value &= ~(RATE_ALL_OFDM_2SS);
 			rtl92e_writel(dev, RATR0, ratr_value);
 			rtl92e_writeb(dev, UFWP, 1);
 
-			pra->last_ratr = targetRATR;
+			pra->last_ratr = target_ratr;
 		}
 
 	} else {
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 3/4 staging: rtl8192e: Rename variable LowRSSIThreshForRA

In reply to Yogesh Hegde

Rename variable LowRSSIThreshForRA to low_rssi_thresh_for_ra to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by Yogesh Hegde <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +5 -5
index a535a63ce9f7..d266d2d047ca 100644
@@ -278,7 +278,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;
 	struct rate_adaptive *pra = &priv->rate_adaptive;
 	u32 current_ratr, target_ratr = 0;
-	u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
+	u32 low_rssi_thresh_for_ra = 0, HighRSSIThreshForRA = 0;
 	bool bshort_gi_enabled = false;
 	static u8 ping_rssi_state;
 

@@ -320,15 +320,15 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 
 		if (pra->ratr_state == DM_RATR_STA_HIGH) {
 			HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra;
-			LowRSSIThreshForRA = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
+			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
 		} else if (pra->ratr_state == DM_RATR_STA_LOW) {
 			HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
-			LowRSSIThreshForRA = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
+			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low2high_rssi_thresh_for_ra40M) : (pra->low2high_rssi_thresh_for_ra20M);
 		} else {
 			HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
-			LowRSSIThreshForRA = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
+			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
 		}
 

@@ -337,7 +337,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 			pra->ratr_state = DM_RATR_STA_HIGH;
 			target_ratr = pra->upper_rssi_threshold_ratr;
 		} else if (priv->undecorated_smoothed_pwdb >=
-			   (long)LowRSSIThreshForRA) {
+			   (long)low_rssi_thresh_for_ra) {
 			pra->ratr_state = DM_RATR_STA_MIDDLE;
 			target_ratr = pra->middle_rssi_threshold_ratr;
 		} else {
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 4/4 staging: rtl8192e: Rename variable HighRSSIThreshForRA

In reply to Yogesh Hegde

Rename variable HighRSSIThreshForRA to high_rssi_thresh_for_ra to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by Yogesh Hegde <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +5 -5
index d266d2d047ca..dbf765d601b3 100644
@@ -278,7 +278,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;
 	struct rate_adaptive *pra = &priv->rate_adaptive;
 	u32 current_ratr, target_ratr = 0;
-	u32 low_rssi_thresh_for_ra = 0, HighRSSIThreshForRA = 0;
+	u32 low_rssi_thresh_for_ra = 0, high_rssi_thresh_for_ra = 0;
 	bool bshort_gi_enabled = false;
 	static u8 ping_rssi_state;
 

@@ -319,21 +319,21 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
 				((bshort_gi_enabled) ? BIT31 : 0);
 
 		if (pra->ratr_state == DM_RATR_STA_HIGH) {
-			HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra;
+			high_rssi_thresh_for_ra = pra->high2low_rssi_thresh_for_ra;
 			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
 		} else if (pra->ratr_state == DM_RATR_STA_LOW) {
-			HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
+			high_rssi_thresh_for_ra = pra->high_rssi_thresh_for_ra;
 			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low2high_rssi_thresh_for_ra40M) : (pra->low2high_rssi_thresh_for_ra20M);
 		} else {
-			HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
+			high_rssi_thresh_for_ra = pra->high_rssi_thresh_for_ra;
 			low_rssi_thresh_for_ra = (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) ?
 					(pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
 		}
 
 		if (priv->undecorated_smoothed_pwdb >=
-		    (long)HighRSSIThreshForRA) {
+		    (long)high_rssi_thresh_for_ra) {
 			pra->ratr_state = DM_RATR_STA_HIGH;
 			target_ratr = pra->upper_rssi_threshold_ratr;
 		} else if (priv->undecorated_smoothed_pwdb >=
Signature · 1 line
2.34.1
Tested-by on the v1 series
#5 lore raw
In reply to Yogesh Hegde
Quoted 5 lines · Yogesh Hegde

Rename variables in function _rtl92e_dm_check_rate_adaptive to avoid checkpatch complains.

The patches are required to be applied in sequence.

Quoted 9 lines

Yogesh Hegde (4):
staging: rtl8192e: Rename variable currentRATR
staging: rtl8192e: Rename variable targetRATR
staging: rtl8192e: Rename variable LowRSSIThreshForRA
staging: rtl8192e: Rename variable HighRSSIThreshForRA

  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 38 +++++++++++-----------
  1 file changed, 19 insertions(+), 19 deletions(-)

Please use the "staging: rtl8192e:" also for the cover letter in the subject for the next patch series you are sending.

Tested-by Philipp Hortmann <[email protected]>
author
#6 lore raw
Quoted 12 lines · Philipp Hortmann
Quoted 11 lines · Yogesh Hegde

Rename variables in function _rtl92e_dm_check_rate_adaptive to avoid checkpatch complains.

The patches are required to be applied in sequence.

Yogesh Hegde (4):
staging: rtl8192e: Rename variable currentRATR
staging: rtl8192e: Rename variable targetRATR
staging: rtl8192e: Rename variable LowRSSIThreshForRA
staging: rtl8192e: Rename variable HighRSSIThreshForRA

Quoted 6 lines
Quoted 3 lines
  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 38 +++++++++++-----------
  1 file changed, 19 insertions(+), 19 deletions(-)

Please use the "staging: rtl8192e:" also for the cover letter in the subject for the next patch series you are sending.

Ack. Will keep in mind for next patch series.

Quoted 3 lines
Tested-by Philipp Hortmann <[email protected]>

Thanks
Yogesh