staging: rtl8192e: Rename Tx_Retry_Count_Reg

[PATCH] staging: rtl8192e: Rename Tx_Retry_Count_Reg

Posted by Dragan Cvetic 3 years, 6 months ago

Rename: Current_Tx_Rate_Reg to CURRENT_TX_RATE_REG, Initial_Tx_Rate_Reg to
INITIAL_TX_RATE_REG and Tx_Retry_Count_Reg to TX_RETRY_COUNT_REG to avoid
CamelCase which is not accepted by checkpatch.pl.

Signed-off-by: Dragan Cvetic <dragan.m.cvetic@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 11 +++--------
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.h |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 3ee52147960e..9fefa1a7ae75 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -2499,14 +2499,9 @@ static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev)
 	struct r8192_priv *priv = rtllib_priv(dev);
 	struct rtllib_device *ieee = priv->rtllib;
 
-	ieee->softmac_stats.CurrentShowTxate = rtl92e_readb(dev,
-						 Current_Tx_Rate_Reg);
-
-	ieee->softmac_stats.last_packet_rate = rtl92e_readb(dev,
-						 Initial_Tx_Rate_Reg);
-
-	ieee->softmac_stats.txretrycount = rtl92e_readl(dev,
-						 Tx_Retry_Count_Reg);
+	ieee->softmac_stats.CurrentShowTxate = rtl92e_readb(dev, CURRENT_TX_RATE_REG);
+	ieee->softmac_stats.last_packet_rate = rtl92e_readb(dev, INITIAL_TX_RATE_REG);
+	ieee->softmac_stats.txretrycount = rtl92e_readl(dev, TX_RETRY_COUNT_REG);
 }
 
 static void _rtl92e_dm_send_rssi_to_fw(struct net_device *dev)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index ea1b14bbcdcd..51e295d389a8 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -42,9 +42,9 @@
 #define	 TX_POWER_ATHEROAP_THRESH_HIGH	   78
 #define		TX_POWER_ATHEROAP_THRESH_LOW		72
 
-#define			Current_Tx_Rate_Reg	 0x1e0
-#define			Initial_Tx_Rate_Reg	 0x1e1
-#define			Tx_Retry_Count_Reg	 0x1ac
+#define		CURRENT_TX_RATE_REG		0x1e0
+#define		INITIAL_TX_RATE_REG		0x1e1
+#define		TX_RETRY_COUNT_REG		0x1ac
 #define		RegC38_TH				 20
 
 #define		DM_Type_ByDriver		1
-- 
2.25.1

Re: [PATCH] staging: rtl8192e: Rename Tx_Retry_Count_Reg

Posted by Philipp Hortmann 3 years, 6 months ago

On 9/25/22 00:51, Dragan Cvetic wrote:
> Rename: Current_Tx_Rate_Reg to CURRENT_TX_RATE_REG, Initial_Tx_Rate_Reg to
> INITIAL_TX_RATE_REG and Tx_Retry_Count_Reg to TX_RETRY_COUNT_REG to avoid
> CamelCase which is not accepted by checkpatch.pl.
> 
> Signed-off-by: Dragan Cvetic <dragan.m.cvetic@gmail.com>
> ---
>   drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 11 +++--------
>   drivers/staging/rtl8192e/rtl8192e/rtl_dm.h |  6 +++---
>   2 files changed, 6 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> index 3ee52147960e..9fefa1a7ae75 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> @@ -2499,14 +2499,9 @@ static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev)
>   	struct r8192_priv *priv = rtllib_priv(dev);
>   	struct rtllib_device *ieee = priv->rtllib;
>   
> -	ieee->softmac_stats.CurrentShowTxate = rtl92e_readb(dev,
> -						 Current_Tx_Rate_Reg);
> -
> -	ieee->softmac_stats.last_packet_rate = rtl92e_readb(dev,
> -						 Initial_Tx_Rate_Reg);
> -
> -	ieee->softmac_stats.txretrycount = rtl92e_readl(dev,
> -						 Tx_Retry_Count_Reg);
> +	ieee->softmac_stats.CurrentShowTxate = rtl92e_readb(dev, CURRENT_TX_RATE_REG);
> +	ieee->softmac_stats.last_packet_rate = rtl92e_readb(dev, INITIAL_TX_RATE_REG);
> +	ieee->softmac_stats.txretrycount = rtl92e_readl(dev, TX_RETRY_COUNT_REG);
>   }
>   
>   static void _rtl92e_dm_send_rssi_to_fw(struct net_device *dev)
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
> index ea1b14bbcdcd..51e295d389a8 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
> @@ -42,9 +42,9 @@
>   #define	 TX_POWER_ATHEROAP_THRESH_HIGH	   78
>   #define		TX_POWER_ATHEROAP_THRESH_LOW		72
>   
> -#define			Current_Tx_Rate_Reg	 0x1e0
> -#define			Initial_Tx_Rate_Reg	 0x1e1
> -#define			Tx_Retry_Count_Reg	 0x1ac
> +#define		CURRENT_TX_RATE_REG		0x1e0
> +#define		INITIAL_TX_RATE_REG		0x1e1
> +#define		TX_RETRY_COUNT_REG		0x1ac
>   #define		RegC38_TH				 20
>   
>   #define		DM_Type_ByDriver		1

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>