[PATCH] staging: rtl8723bs: drop duplicate blank lines in core files

[PATCH] staging: rtl8723bs: drop duplicate blank lines in core files

[Stepan Ionichev]

Remove redundant blank lines flagged by checkpatch.pl in three core
source files of the rtl8723bs driver:

  rtw_btcoex.c:    multiple blank lines
  rtw_efuse.c:     multiple blank lines
  rtw_ieee80211.c: blank line before a close brace

No functional change.

Signed-off-by: Stepan Ionichev <sozdayvek@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_btcoex.c    | 1 -
 drivers/staging/rtl8723bs/core/rtw_efuse.c     | 1 -
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 -
 3 files changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 0191a943f..27dfd00b4 100644
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -65,7 +65,6 @@ void rtw_btcoex_LPS_Leave(struct adapter *padapter)
 {
 	struct pwrctrl_priv *pwrpriv;
 
-
 	pwrpriv = adapter_to_pwrctl(padapter);
 
 	if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 099320e4e..0cd7ce242 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -232,7 +232,6 @@ void EFUSE_ShadowMapUpdate(struct adapter *padapter, u8 efuseType)
 	/* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */
 } /*  EFUSE_ShadowMapUpdate */
 
-
 /*-----------------------------------------------------------------------------
  * Function:	EFUSE_ShadowRead
  *
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 72b7f731d..5fb1fe5b7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -593,7 +593,6 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)
 
 			if (wapi_len)
 				*wapi_len = in_ie[cnt + 1] + 2;
-
 		}
 
 		cnt += in_ie[cnt + 1] + 2;   /* get next */
-- 
2.33.0.windows.2

Re: [PATCH] staging: rtl8723bs: drop duplicate blank lines in core files

[Luka Gejak]

> Remove redundant blank lines flagged by checkpatch.pl in three core
> source files of the rtl8723bs driver:
> 
>   rtw_btcoex.c:    multiple blank lines
>   rtw_efuse.c:     multiple blank lines
>   rtw_ieee80211.c: blank line before a close brace
> 
> No functional change.
> 
> Signed-off-by: Stepan Ionichev <sozdayvek@gmail.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_btcoex.c    | 1 -
>  drivers/staging/rtl8723bs/core/rtw_efuse.c     | 1 -
>  drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 -
>  3 files changed, 3 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
> index 0191a943f..27dfd00b4 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
> @@ -65,7 +65,6 @@ void rtw_btcoex_LPS_Leave(struct adapter *padapter)
>  {
>  	struct pwrctrl_priv *pwrpriv;
>  
> -
>  	pwrpriv = adapter_to_pwrctl(padapter);
>  
>  	if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
> diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> index 099320e4e..0cd7ce242 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> @@ -232,7 +232,6 @@ void EFUSE_ShadowMapUpdate(struct adapter *padapter, u8 efuseType)
>  	/* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */
>  } /*  EFUSE_ShadowMapUpdate */
>  
> -
>  /*-----------------------------------------------------------------------------
>   * Function:	EFUSE_ShadowRead
>   *
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> index 72b7f731d..5fb1fe5b7 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> @@ -593,7 +593,6 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)
>  
>  			if (wapi_len)
>  				*wapi_len = in_ie[cnt + 1] + 2;
> -
>  		}
>  
>  		cnt += in_ie[cnt + 1] + 2;   /* get next */
> -- 
> 2.33.0.windows.2
> 

These changes are already present in staging-next branch. Please use 
staging-next for development, not mainline repo.
Best regards,
Luka Gejak

[PATCH v2] staging: rtl8723bs: drop blank line before close brace in rtw_ieee80211.c

[Stepan Ionichev]

Drop a blank line before a close brace in rtw_get_wapi_ie(),
flagged by checkpatch.pl:

  CHECK: Blank lines aren't necessary before a close brace '}'

No functional change.

Signed-off-by: Stepan Ionichev <sozdayvek@gmail.com>
---
v2:
- Rebased onto staging-next, as suggested by Luka Gejak.
- Dropped the rtw_btcoex.c and rtw_efuse.c hunks: already addressed by
  commit 7dbc9fd71438 ("staging: rtl8723bs: remove multiple blank lines
  in core/").
- Narrowed subject to reflect the remaining single-file scope.

 drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 72b7f731d..5fb1fe5b7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -593,7 +593,6 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)
 
 			if (wapi_len)
 				*wapi_len = in_ie[cnt + 1] + 2;
-
 		}
 
 		cnt += in_ie[cnt + 1] + 2;   /* get next */
-- 
2.33.0.windows.2