1. Patchew
  2. linux
  3. View series

[PATCH v3] staging: rtl8192e: space formatting fixes in rtl_cam.c

Jerom van der Sar posted 1 patch 3 years, 5 months ago
There is a newer version of this series
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
[PATCH v3] staging: rtl8192e: space formatting fixes in rtl_cam.c
Posted by Jerom van der Sar 3 years, 5 months ago 
Fixed a few coding style issues in rtl_cam.c such as double blank lines
and lack of spaces around binary operators.Some other warnings still
remain. These issues were found by scripts/checkpatch.pl.

This patch helps clean up the rtl8192e driver in staging, making it
easier to read and maintain.

Signed-off-by: Jerom van der Sar <jerom.vandersar@gmail.com>
---
Changes in v3:
  - Fixed faulty dot at the end of the patch sign-off.

Changes in v2:
  - Reverted some formatting fixes to make the diff easier to review.

 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 41faeb4b9b9b..d5aaf24a0ddb 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
 {
 	u32 ulcommand = 0;
 
-	ulcommand |= BIT31|BIT30;
+	ulcommand |= BIT31 | BIT30;
 	rtl92e_writel(dev, RWCAM, ulcommand);
 }
 
@@ -40,7 +40,6 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
 		SECR_value |= SCR_TxUseDK;
 	}
 
-
 	ieee->hwsec_active = 1;
 	if ((ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) {
 		ieee->hwsec_active = 0;
@@ -104,10 +103,9 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
 	else
 		usConfig |= BIT15 | (KeyType<<2) | KeyIndex;
 
-
 	for (i = 0; i < CAM_CONTENT_COUNT; i++) {
 		TargetCommand  = i + CAM_CONTENT_COUNT * EntryNo;
-		TargetCommand |= BIT31|BIT16;
+		TargetCommand |= BIT31 | BIT16;
 
 		if (i == 0) {
 			TargetContent = (u32)(*(MacAddr+0)) << 16 |
@@ -152,7 +150,6 @@ void rtl92e_cam_restore(struct net_device *dev)
 
 	if ((priv->rtllib->pairwise_key_type == KEY_TYPE_WEP40) ||
 	    (priv->rtllib->pairwise_key_type == KEY_TYPE_WEP104)) {
-
 		for (EntryId = 0; EntryId < 4; EntryId++) {
 			MacAddr = CAM_CONST_ADDR[EntryId];
 			if (priv->rtllib->swcamtable[EntryId].bused) {
-- 
2.34.1
Re: [PATCH v3] staging: rtl8192e: space formatting fixes in rtl_cam.c
Posted by Greg KH 3 years, 5 months ago 
On Tue, Nov 01, 2022 at 11:29:00PM +0100, Jerom van der Sar wrote:
> Fixed a few coding style issues in rtl_cam.c such as double blank lines
> and lack of spaces around binary operators.Some other warnings still
> remain. These issues were found by scripts/checkpatch.pl.
> 
> This patch helps clean up the rtl8192e driver in staging, making it
> easier to read and maintain.
> 
> Signed-off-by: Jerom van der Sar <jerom.vandersar@gmail.com>
> ---
> Changes in v3:
>   - Fixed faulty dot at the end of the patch sign-off.
> 
> Changes in v2:
>   - Reverted some formatting fixes to make the diff easier to review.
> 
>  drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> index 41faeb4b9b9b..d5aaf24a0ddb 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> @@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
>  {
>  	u32 ulcommand = 0;
>  
> -	ulcommand |= BIT31|BIT30;
> +	ulcommand |= BIT31 | BIT30;

Ok, new spaces, nice!

>  	rtl92e_writel(dev, RWCAM, ulcommand);
>  }
>  
> @@ -40,7 +40,6 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
>  		SECR_value |= SCR_TxUseDK;
>  	}
>  
> -

You removed a line?

That's a different type of fix, sorry.  Please break this up into a "one
logical change per patch" patch series and resend.

thanks,

greg k-h
[PATCH v4] staging: rtl8192e: space formatting fixes in rtl_cam.c
Posted by Jerom van der Sar 3 years, 5 months ago 
Fixed a few coding style issues in rtl_cam.c: two times lack of
spaces around binary operators. Some other warnings still remain.
These issues were found by scripts/checkpatch.pl.

This patch helps clean up the rtl8192e driver in staging, making it
easier to read and maintain.

Signed-off-by: Jerom van der Sar <jerom.vandersar@gmail.com>
---
Changes in v4:
 - Reverted more double blank line formatting fixes to make the patch
   even smaller.

Changes in v3:
  - Fixed faulty dot at the end of the patch sign-off.

Changes in v2:
  - Reverted some formatting fixes to make the diff easier to review.

 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 41faeb4b9b9b..41bff46d1b3a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
 {
 	u32 ulcommand = 0;
 
-	ulcommand |= BIT31|BIT30;
+	ulcommand |= BIT31 | BIT30;
 	rtl92e_writel(dev, RWCAM, ulcommand);
 }
 
@@ -107,7 +107,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
 
 	for (i = 0; i < CAM_CONTENT_COUNT; i++) {
 		TargetCommand  = i + CAM_CONTENT_COUNT * EntryNo;
-		TargetCommand |= BIT31|BIT16;
+		TargetCommand |= BIT31 | BIT16;
 
 		if (i == 0) {
 			TargetContent = (u32)(*(MacAddr+0)) << 16 |
-- 
2.34.1
Re: [PATCH v4] staging: rtl8192e: space formatting fixes in rtl_cam.c
Posted by Greg KH 3 years, 5 months ago 
On Wed, Nov 02, 2022 at 09:00:58PM +0100, Jerom van der Sar wrote:
> Fixed a few coding style issues in rtl_cam.c: two times lack of
> spaces around binary operators. Some other warnings still remain.
> These issues were found by scripts/checkpatch.pl.
> 
> This patch helps clean up the rtl8192e driver in staging, making it
> easier to read and maintain.
> 
> Signed-off-by: Jerom van der Sar <jerom.vandersar@gmail.com>
> ---
> Changes in v4:
>  - Reverted more double blank line formatting fixes to make the patch
>    even smaller.

Does not apply to my tree :(
Re: [PATCH v4] staging: rtl8192e: space formatting fixes in rtl_cam.c
Posted by Philipp Hortmann 3 years, 5 months ago 
On 11/2/22 21:00, Jerom van der Sar wrote:
> Fixed a few coding style issues in rtl_cam.c: two times lack of
> spaces around binary operators. Some other warnings still remain.
> These issues were found by scripts/checkpatch.pl.
> 
> This patch helps clean up the rtl8192e driver in staging, making it
> easier to read and maintain.
> 
> Signed-off-by: Jerom van der Sar <jerom.vandersar@gmail.com>
> ---
> Changes in v4:
>   - Reverted more double blank line formatting fixes to make the patch
>     even smaller.
> 
> Changes in v3:
>    - Fixed faulty dot at the end of the patch sign-off.
> 
> Changes in v2:
>    - Reverted some formatting fixes to make the diff easier to review.
> 
>   drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> index 41faeb4b9b9b..41bff46d1b3a 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
> @@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
>   {
>   	u32 ulcommand = 0;
>   
> -	ulcommand |= BIT31|BIT30;
> +	ulcommand |= BIT31 | BIT30;
>   	rtl92e_writel(dev, RWCAM, ulcommand);
>   }
>   
> @@ -107,7 +107,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
>   
>   	for (i = 0; i < CAM_CONTENT_COUNT; i++) {
>   		TargetCommand  = i + CAM_CONTENT_COUNT * EntryNo;
> -		TargetCommand |= BIT31|BIT16;
> +		TargetCommand |= BIT31 | BIT16;
>   
>   		if (i == 0) {
>   			TargetContent = (u32)(*(MacAddr+0)) << 16 |

Please rebase. I cannot apply your patch.

Bye Philipp

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.