[PATCH 0/6] staging: rtl8723bs: Fix various coding style issues

[PATCH 0/6] staging: rtl8723bs: Fix various coding style issues

[Sayyad Abid]

This patch series fixes various coding style issues in the
rtl8723bs/include/rtw_security.h

Patches :
  Patch 1/6: fix use of tab wherever possible
  Patch 2/6: fix position of opening braces
  Patch 3/6: fix space before tabs
  Patch 4/6: fix comment with a trailing */ on a separate line
  Patch 5/6: fix switch and case to be at same indent
  Patch 6/6: fix no space before tab and statement start on tabstop

All these patches address minor coding style issues in the file.

 .../staging/rtl8723bs/include/rtw_security.h  | 95 +++++++++----------
 1 file changed, 47 insertions(+), 48 deletions(-)

-- 
2.39.2

[PATCH 1/6] staging: rtl8723bs: fix use of tab wherever possible

[Sayyad Abid]

This patch fixes the coding style issue by fixing the use of space
instead of tabs on line.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 drivers/staging/rtl8723bs/include/rtw_security.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 98afbd3054a4..487d69460cec 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -75,8 +75,8 @@ struct {
 };
 
 union Keytype {
-        u8   skey[16];
-        u32    lkey[4];
+	u8   skey[16];
+	u32    lkey[4];
 };
 
 
-- 
2.39.2

[PATCH 2/6] staging: rtl8723bs: fix position of opening braces

[Sayyad Abid]

This patch fixes the coding style issue of opening bracket "{" being on
the next line.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 drivers/staging/rtl8723bs/include/rtw_security.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 487d69460cec..3ccbccf92417 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -170,8 +170,7 @@ struct security_priv {
 
 #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
 do {\
-	switch (psecuritypriv->dot11AuthAlgrthm)\
-	{\
+	switch (psecuritypriv->dot11AuthAlgrthm) {\
 		case dot11AuthAlgrthm_Open:\
 		case dot11AuthAlgrthm_Shared:\
 		case dot11AuthAlgrthm_Auto:\
@@ -191,8 +190,7 @@ do {\
 
 #define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)\
 do {\
-	switch (encrypt)\
-	{\
+	switch (encrypt) {\
 		case _WEP40_:\
 		case _WEP104_:\
 			iv_len = 4;\
-- 
2.39.2

[PATCH 3/6] staging: rtl8723bs: fix space before tabs

[Sayyad Abid]

This patch fixes the coding style issue of removing extra space before
tabs.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 drivers/staging/rtl8723bs/include/rtw_security.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 3ccbccf92417..4efa2d258ebf 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -81,12 +81,12 @@ union Keytype {
 
 
 struct rt_pmkid_list {
-	u8 				bUsed;
-	u8 				Bssid[6];
-	u8 				PMKID[16];
-	u8 				SsidBuf[33];
+	u8				bUsed;
+	u8				Bssid[6];
+	u8				PMKID[16];
+	u8				SsidBuf[33];
 	u8 *ssid_octet;
-	u16 					ssid_length;
+	u16					ssid_length;
 };
 
 
-- 
2.39.2

[PATCH 4/6] staging: rtl8723bs: fix comment with a trailing */ on a separate line

[Sayyad Abid]

This patch fixes the trailing "*/" on a comment block.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 drivers/staging/rtl8723bs/include/rtw_security.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 4efa2d258ebf..1e5e7f52f8da 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -240,7 +240,8 @@ struct mic_data {
 /* ===== start - public domain SHA256 implementation ===== */
 
 /* This is based on SHA256 implementation in LibTomCrypt that was released into
- * public domain by Tom St Denis. */
+ * public domain by Tom St Denis.
+ */
 
 int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac);
 void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key);
-- 
2.39.2

[PATCH 5/6] staging: rtl8723bs: fix switch and case to be at same indent

[Sayyad Abid]

This patch fixes the indentation for the switch case statements. Aligns
them with right indentation.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 .../staging/rtl8723bs/include/rtw_security.h  | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 1e5e7f52f8da..740c8504cba7 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -171,47 +171,47 @@ struct security_priv {
 #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
 do {\
 	switch (psecuritypriv->dot11AuthAlgrthm) {\
-		case dot11AuthAlgrthm_Open:\
-		case dot11AuthAlgrthm_Shared:\
-		case dot11AuthAlgrthm_Auto:\
-			encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
-			break;\
-		case dot11AuthAlgrthm_8021X:\
-			if (bmcst)\
-				encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\
-			else\
-				encry_algo = (u8)psta->dot118021XPrivacy;\
-			break;\
-	     case dot11AuthAlgrthm_WAPI:\
-		     encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
-		     break;\
+	case dot11AuthAlgrthm_Open:\
+	case dot11AuthAlgrthm_Shared:\
+	case dot11AuthAlgrthm_Auto:\
+		encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
+		break;\
+	case dot11AuthAlgrthm_8021X:\
+		if (bmcst)\
+			encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\
+		else\
+			encry_algo = (u8)psta->dot118021XPrivacy;\
+		break;\
+	case dot11AuthAlgrthm_WAPI:\
+		encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
+		break;\
 	} \
 } while (0)
 
 #define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)\
 do {\
 	switch (encrypt) {\
-		case _WEP40_:\
-		case _WEP104_:\
-			iv_len = 4;\
-			icv_len = 4;\
-			break;\
-		case _TKIP_:\
-			iv_len = 8;\
-			icv_len = 4;\
-			break;\
-		case _AES_:\
-			iv_len = 8;\
-			icv_len = 8;\
-			break;\
-		case _SMS4_:\
-			iv_len = 18;\
-			icv_len = 16;\
-			break;\
-		default:\
-			iv_len = 0;\
-			icv_len = 0;\
-			break;\
+	case _WEP40_:\
+	case _WEP104_:\
+		iv_len = 4;\
+		icv_len = 4;\
+		break;\
+	case _TKIP_:\
+		iv_len = 8;\
+		icv_len = 4;\
+		break;\
+	case _AES_:\
+		iv_len = 8;\
+		icv_len = 8;\
+		break;\
+	case _SMS4_:\
+		iv_len = 18;\
+		icv_len = 16;\
+		break;\
+	default:\
+		iv_len = 0;\
+		icv_len = 0;\
+		break;\
 	} \
 } while (0)
 
-- 
2.39.2

[PATCH 6/6] staging: rtl8723bs: fix no space before tab and statement start on tabstop

[Sayyad Abid]

This patch fixes the space before tabs and also makes the sentences
start on a tabstop instead of spaces.

Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

---
 drivers/staging/rtl8723bs/include/rtw_security.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 740c8504cba7..f005ec88d00a 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -162,7 +162,7 @@ struct security_priv {
 
 	/*  For WPA2 Pre-Authentication. */
 	struct rt_pmkid_list		PMKIDList[NUM_PMKID_CACHE];	/*  Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. */
-	u8 		PMKIDIndex;
+	u8		PMKIDIndex;
 
 	u8 bWepDefaultKeyIdxSet;
 
@@ -183,8 +183,8 @@ do {\
 			encry_algo = (u8)psta->dot118021XPrivacy;\
 		break;\
 	case dot11AuthAlgrthm_WAPI:\
-	     encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
-	     break;\
+		encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
+		break;\
 	} \
 } while (0)
 
-- 
2.39.2

Re: [PATCH 1/6] staging: rtl8723bs: fix use of tab wherever possible

[Philipp Hortmann]

On 9/8/24 12:11, Sayyad Abid wrote:
> This patch fixes the coding style issue by fixing the use of space
> instead of tabs on line.
> 
> Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>

Hi Sayyad,

please make your "Subject" line more unique. Consider that we may end up 
with having dozen of commits like yours, all of them referring to 
different removals and all without the necessary information to tell 
what they differ in (except the driver/subsystem). So it would help if 
you add the changed file or function to make it more unique.

Please also improve the Subject Lines of the other patches.

If you send in a second version of this patch please use a change 
history. Description from Dan under:
https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/

Thanks for your support.

Bye Philipp

> 
> ---
>   drivers/staging/rtl8723bs/include/rtw_security.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> index 98afbd3054a4..487d69460cec 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> @@ -75,8 +75,8 @@ struct {
>   };
>   
>   union Keytype {
> -        u8   skey[16];
> -        u32    lkey[4];
> +	u8   skey[16];
> +	u32    lkey[4];
>   };
>   
>   

Re: [PATCH 4/6] staging: rtl8723bs: fix comment with a trailing */ on a separate line

[Philipp Hortmann]

On 9/8/24 12:11, Sayyad Abid wrote:
> This patch fixes the trailing "*/" on a comment block.

Hi Sayyad,

important is to describe why this patch makes the code better. You 
described in the description just what you did. But that can be seen in 
the changed lines blow.

Thanks

Bye Philipp

> 
> Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>
> 
> ---
>   drivers/staging/rtl8723bs/include/rtw_security.h | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> index 4efa2d258ebf..1e5e7f52f8da 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> @@ -240,7 +240,8 @@ struct mic_data {
>   /* ===== start - public domain SHA256 implementation ===== */
>   
>   /* This is based on SHA256 implementation in LibTomCrypt that was released into
> - * public domain by Tom St Denis. */
> + * public domain by Tom St Denis.
> + */
>   
>   int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac);
>   void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key);

Re: [PATCH 2/6] staging: rtl8723bs: fix position of opening braces

[Philipp Hortmann]

On 9/8/24 12:11, Sayyad Abid wrote:
> This patch fixes the coding style issue of opening bracket "{" being on
> the next line.
> 
> Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>
> 
> ---
>   drivers/staging/rtl8723bs/include/rtw_security.h | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> index 487d69460cec..3ccbccf92417 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> @@ -170,8 +170,7 @@ struct security_priv {
>   
>   #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
>   do {\
> -	switch (psecuritypriv->dot11AuthAlgrthm)\
> -	{\
> +	switch (psecuritypriv->dot11AuthAlgrthm) {\
>   		case dot11AuthAlgrthm_Open:\
>   		case dot11AuthAlgrthm_Shared:\
>   		case dot11AuthAlgrthm_Auto:\
> @@ -191,8 +190,7 @@ do {\
>   
>   #define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)\
>   do {\
> -	switch (encrypt)\
> -	{\
> +	switch (encrypt) {\
>   		case _WEP40_:\
>   		case _WEP104_:\
>   			iv_len = 4;\


Hi Sayyad,

I cannot apply this patch. Please rebase.

Thanks for your support.

Bye Philipp

Re: [PATCH 1/6] staging: rtl8723bs: fix use of tab wherever possible

[Sayyad Abid]

On Mon, Sep 9, 2024 at 1:53 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 9/8/24 12:11, Sayyad Abid wrote:
> > This patch fixes the coding style issue by fixing the use of space
> > instead of tabs on line.
> >
> > Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>
>
> Hi Sayyad,
>
> please make your "Subject" line more unique. Consider that we may end up
> with having dozen of commits like yours, all of them referring to
> different removals and all without the necessary information to tell
> what they differ in (except the driver/subsystem). So it would help if
> you add the changed file or function to make it more unique.
>
Roger that, I'll keep that in mind while sending future patches.
> Please also improve the Subject Lines of the other patches.
>
sure, will do.
> If you send in a second version of this patch please use a change
> history. Description from Dan under:
> https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/
I think I am having some issues with the local repository,
I'll rebase and check again for the discrepancies. If the issue persists,
I will send a v2.
>
> Thanks for your support.
>
> Bye Philipp
>
> >
> > ---
> >   drivers/staging/rtl8723bs/include/rtw_security.h | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> > index 98afbd3054a4..487d69460cec 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> > @@ -75,8 +75,8 @@ struct {
> >   };
> >
> >   union Keytype {
> > -        u8   skey[16];
> > -        u32    lkey[4];
> > +     u8   skey[16];
> > +     u32    lkey[4];
> >   };
> >
> >
>
Thanks for pointing out the issues.


-- 
Abid

Re: [PATCH 4/6] staging: rtl8723bs: fix comment with a trailing */ on a separate line

[Sayyad Abid]

On Mon, Sep 9, 2024 at 1:56 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 9/8/24 12:11, Sayyad Abid wrote:
> > This patch fixes the trailing "*/" on a comment block.
>
> Hi Sayyad,
>
> important is to describe why this patch makes the code better. You
> described in the description just what you did. But that can be seen in
> the changed lines blow.
>
Note, I'll add a descriptive summary of the "why" for the patches.
> Thanks
>
> Bye Philipp
>
> >
> > Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>
> >
> > ---
> >   drivers/staging/rtl8723bs/include/rtw_security.h | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> > index 4efa2d258ebf..1e5e7f52f8da 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> > @@ -240,7 +240,8 @@ struct mic_data {
> >   /* ===== start - public domain SHA256 implementation ===== */
> >
> >   /* This is based on SHA256 implementation in LibTomCrypt that was released into
> > - * public domain by Tom St Denis. */
> > + * public domain by Tom St Denis.
> > + */
> >
> >   int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac);
> >   void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key);
>
Thank you!

-- 
Abid

Re: [PATCH 2/6] staging: rtl8723bs: fix position of opening braces

[Sayyad Abid]

On Mon, Sep 9, 2024 at 2:03 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 9/8/24 12:11, Sayyad Abid wrote:
> > This patch fixes the coding style issue of opening bracket "{" being on
> > the next line.
> >
> > Signed-off-by: Sayyad Abid <sayyad.abid16@gmail.com>
> >
> > ---
> >   drivers/staging/rtl8723bs/include/rtw_security.h | 6 ++----
> >   1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
> > index 487d69460cec..3ccbccf92417 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> > @@ -170,8 +170,7 @@ struct security_priv {
> >
> >   #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
> >   do {\
> > -     switch (psecuritypriv->dot11AuthAlgrthm)\
> > -     {\
> > +     switch (psecuritypriv->dot11AuthAlgrthm) {\
> >               case dot11AuthAlgrthm_Open:\
> >               case dot11AuthAlgrthm_Shared:\
> >               case dot11AuthAlgrthm_Auto:\
> > @@ -191,8 +190,7 @@ do {\
> >
> >   #define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)\
> >   do {\
> > -     switch (encrypt)\
> > -     {\
> > +     switch (encrypt) {\
> >               case _WEP40_:\
> >               case _WEP104_:\
> >                       iv_len = 4;\
>
>
> Hi Sayyad,
>
> I cannot apply this patch. Please rebase.
>
Okay, will do this.
> Thanks for your support.
>
> Bye Philipp
Thank You!


-- 
Abid