[PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: move the declaration and initialization of 'evt_seq' inside ifdef macro

[PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: move the declaration and initialization of 'evt_seq' inside ifdef macro

[Yu Kuai]

'evt_seq' is only used if 'CHECK_ENENT_SEQ' is defined, however,
it's declared and initialized even if 'CHECK_ENENT_SEQ' is not
defined. Thus gcc will report following warning if
'CHECK_ENENT_SEQ' is not defined:

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:6009:15: warning:
 variable ‘evt_seq’ set but not used [-Wunused-but-set-variable]
 6009 |  u8 evt_code, evt_seq;

Thus move the declaration and initialization of 'evt_seq' inside
ifdef macro to fix it.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 97b3c2965770..e883371cc96d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -6006,7 +6006,10 @@ static struct fwevent wlanevents[] = {
 
 u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 {
-	u8 evt_code, evt_seq;
+#ifdef CHECK_EVENT_SEQ
+	u8 evt_seq;
+#endif
+	u8 evt_code;
 	u16 evt_sz;
 	uint	*peventbuf;
 	void (*event_callback)(struct adapter *dev, u8 *pbuf);
@@ -6017,18 +6020,17 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 
 	peventbuf = (uint *)pbuf;
 	evt_sz = (u16)(*peventbuf&0xffff);
-	evt_seq = (u8)((*peventbuf>>24)&0x7f);
 	evt_code = (u8)((*peventbuf>>16)&0xff);
 
-
-	#ifdef CHECK_EVENT_SEQ
+#ifdef CHECK_EVENT_SEQ
 	/*  checking event sequence... */
+	evt_seq = (u8)((*peventbuf>>24)&0x7f);
 	if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
 		pevt_priv->event_seq = (evt_seq+1)&0x7f;
 
 		goto _abort_event_;
 	}
-	#endif
+#endif
 
 	/*  checking if event code is valid */
 	if (evt_code >= MAX_C2HEVT)
-- 
2.25.4

Re: [PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: move the declaration and initialization of 'evt_seq' inside ifdef macro

[Fabio Aiuto]

Hi Yu,

On Sat, May 29, 2021 at 05:29:48PM +0800, Yu Kuai wrote:
> 'evt_seq' is only used if 'CHECK_ENENT_SEQ' is defined, however,
> it's declared and initialized even if 'CHECK_ENENT_SEQ' is not
> defined. Thus gcc will report following warning if
> 'CHECK_ENENT_SEQ' is not defined:

the macro is mispelled in the commit description

> 
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:6009:15: warning:
>  variable ‘evt_seq’ set but not used [-Wunused-but-set-variable]
>  6009 |  u8 evt_code, evt_seq;
> 
> Thus move the declaration and initialization of 'evt_seq' inside
> ifdef macro to fix it.
> 
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 97b3c2965770..e883371cc96d 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -6006,7 +6006,10 @@ static struct fwevent wlanevents[] = {
>  
>  u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
>  {
> -	u8 evt_code, evt_seq;
> +#ifdef CHECK_EVENT_SEQ
> +	u8 evt_seq;
> +#endif
> +	u8 evt_code;
>  	u16 evt_sz;
>  	uint	*peventbuf;
>  	void (*event_callback)(struct adapter *dev, u8 *pbuf);
> @@ -6017,18 +6020,17 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
>  
>  	peventbuf = (uint *)pbuf;
>  	evt_sz = (u16)(*peventbuf&0xffff);
> -	evt_seq = (u8)((*peventbuf>>24)&0x7f);
>  	evt_code = (u8)((*peventbuf>>16)&0xff);
>  
> -
> -	#ifdef CHECK_EVENT_SEQ
> +#ifdef CHECK_EVENT_SEQ
>  	/*  checking event sequence... */
> +	evt_seq = (u8)((*peventbuf>>24)&0x7f);
>  	if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
>  		pevt_priv->event_seq = (evt_seq+1)&0x7f;
>  
>  		goto _abort_event_;
>  	}
> -	#endif
> +#endif
>  
>  	/*  checking if event code is valid */
>  	if (evt_code >= MAX_C2HEVT)
> -- 
> 2.25.4
> 
> 

this conditional block seems to be dead code, for
the symbolic constant CHECK_EVENT_SEQ is defined nowhere in
the code.

/staging$ grep -r CHECK_EVENT_SEQ .
./staging/rtl8723bs/core/rtw_mlme_ext.c:	#ifdef CHECK_EVENT_SEQ

so the variable can be safely removed together with
the dead code block.

thank you,

fabio

[PATCH V2] staging: rtl8723bs: core: rtw_mlme_ext.c: remove deadcode

[Yu Kuai]

'CHECK_EVENT_SEQ' is not defined anywhere, remove the deadcode.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 97b3c2965770..2b95a49ab469 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -6006,7 +6006,7 @@ static struct fwevent wlanevents[] = {
 
 u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 {
-	u8 evt_code, evt_seq;
+	u8 evt_code;
 	u16 evt_sz;
 	uint	*peventbuf;
 	void (*event_callback)(struct adapter *dev, u8 *pbuf);
@@ -6017,19 +6017,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 
 	peventbuf = (uint *)pbuf;
 	evt_sz = (u16)(*peventbuf&0xffff);
-	evt_seq = (u8)((*peventbuf>>24)&0x7f);
 	evt_code = (u8)((*peventbuf>>16)&0xff);
 
-
-	#ifdef CHECK_EVENT_SEQ
-	/*  checking event sequence... */
-	if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
-		pevt_priv->event_seq = (evt_seq+1)&0x7f;
-
-		goto _abort_event_;
-	}
-	#endif
-
 	/*  checking if event code is valid */
 	if (evt_code >= MAX_C2HEVT)
 		goto _abort_event_;
-- 
2.25.4

Re: [PATCH V2] staging: rtl8723bs: core: rtw_mlme_ext.c: remove deadcode

[Greg KH]

On Sat, May 29, 2021 at 06:24:31PM +0800, Yu Kuai wrote:
> 'CHECK_EVENT_SEQ' is not defined anywhere, remove the deadcode.
> 
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 97b3c2965770..2b95a49ab469 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -6006,7 +6006,7 @@ static struct fwevent wlanevents[] = {
>  
>  u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
>  {
> -	u8 evt_code, evt_seq;
> +	u8 evt_code;
>  	u16 evt_sz;
>  	uint	*peventbuf;
>  	void (*event_callback)(struct adapter *dev, u8 *pbuf);
> @@ -6017,19 +6017,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
>  
>  	peventbuf = (uint *)pbuf;
>  	evt_sz = (u16)(*peventbuf&0xffff);
> -	evt_seq = (u8)((*peventbuf>>24)&0x7f);
>  	evt_code = (u8)((*peventbuf>>16)&0xff);
>  
> -
> -	#ifdef CHECK_EVENT_SEQ
> -	/*  checking event sequence... */
> -	if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
> -		pevt_priv->event_seq = (evt_seq+1)&0x7f;
> -
> -		goto _abort_event_;
> -	}
> -	#endif
> -
>  	/*  checking if event code is valid */
>  	if (evt_code >= MAX_C2HEVT)
>  		goto _abort_event_;
> -- 
> 2.25.4
> 
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- This looks like a new version of a previously submitted patch, but you
  did not list below the --- line any changes from the previous version.
  Please read the section entitled "The canonical patch format" in the
  kernel file, Documentation/SubmittingPatches for what needs to be done
  here to properly describe this.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot

[PATCH V3] staging: rtl8723bs: core: rtw_mlme_ext.c: remove deadcode

[Yu Kuai]

'CHECK_EVENT_SEQ' is not defined anywhere, remove the deadcode.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
Changes in V2:
 - remove dead code to fix unused variable.
 - use a new tittle.

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 97b3c2965770..2b95a49ab469 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -6006,7 +6006,7 @@ static struct fwevent wlanevents[] = {
 
 u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 {
-	u8 evt_code, evt_seq;
+	u8 evt_code;
 	u16 evt_sz;
 	uint	*peventbuf;
 	void (*event_callback)(struct adapter *dev, u8 *pbuf);
@@ -6017,19 +6017,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 
 	peventbuf = (uint *)pbuf;
 	evt_sz = (u16)(*peventbuf&0xffff);
-	evt_seq = (u8)((*peventbuf>>24)&0x7f);
 	evt_code = (u8)((*peventbuf>>16)&0xff);
 
-
-	#ifdef CHECK_EVENT_SEQ
-	/*  checking event sequence... */
-	if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
-		pevt_priv->event_seq = (evt_seq+1)&0x7f;
-
-		goto _abort_event_;
-	}
-	#endif
-
 	/*  checking if event code is valid */
 	if (evt_code >= MAX_C2HEVT)
 		goto _abort_event_;
-- 
2.31.1