[PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: Remove set but unused variable

[PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: Remove set but unused variable

[Fabio M. De Francesco]

Removed set but unused 'reason_code' variable. Issue detected by GCC
running with the warning option -Wunused-but-set-variable. Removed its
use as a storage of the return value of get_unaligned_le16(), which has
been left as is because it has side effects on the argument it takes.

Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 9fc612fb736f..a13b3ec42bc9 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1721,7 +1721,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
 	struct recv_reorder_ctrl *preorder_ctrl;
 	unsigned char 	*frame_body;
 	unsigned char 	category, action;
-	unsigned short	tid, status, reason_code = 0;
+	unsigned short	tid, status;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 	u8 *pframe = precv_frame->u.hdr.rx_data;
@@ -1791,8 +1791,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
 				psta->htpriv.candidate_tid_bitmap &=
 					~BIT((frame_body[3] >> 4) & 0xf);
 
-				/* reason_code = frame_body[4] | (frame_body[5] << 8); */
-				reason_code = get_unaligned_le16(&frame_body[4]);
+				get_unaligned_le16(&frame_body[4]);
 			} else if ((frame_body[3] & BIT(3)) == BIT(3)) {
 				tid = (frame_body[3] >> 4) & 0x0F;
 
-- 
2.31.1

Re: [PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: Remove set but unused variable

[Dan Carpenter]

On Sun, May 23, 2021 at 07:30:42PM +0200, Fabio M. De Francesco wrote:
> Removed set but unused 'reason_code' variable. Issue detected by GCC
> running with the warning option -Wunused-but-set-variable. Removed its
> use as a storage of the return value of get_unaligned_le16(), which has
> been left as is because it has side effects on the argument it takes.
> 
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 9fc612fb736f..a13b3ec42bc9 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -1721,7 +1721,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
>  	struct recv_reorder_ctrl *preorder_ctrl;
>  	unsigned char 	*frame_body;
>  	unsigned char 	category, action;
> -	unsigned short	tid, status, reason_code = 0;
> +	unsigned short	tid, status;
>  	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
>  	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
>  	u8 *pframe = precv_frame->u.hdr.rx_data;
> @@ -1791,8 +1791,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
>  				psta->htpriv.candidate_tid_bitmap &=
>  					~BIT((frame_body[3] >> 4) & 0xf);
>  
> -				/* reason_code = frame_body[4] | (frame_body[5] << 8); */
> -				reason_code = get_unaligned_le16(&frame_body[4]);
> +				get_unaligned_le16(&frame_body[4]);

It doesn't have any side effects.  Just delete it too.

regards,
dan carpenter

Re: [PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: Remove set but unused variable

[Fabio M. De Francesco]

On Monday, May 24, 2021 11:25:52 AM CEST Dan Carpenter wrote:
> On Sun, May 23, 2021 at 07:30:42PM +0200, Fabio M. De Francesco wrote:
> > Removed set but unused 'reason_code' variable. Issue detected by GCC
> > running with the warning option -Wunused-but-set-variable. Removed its
> > use as a storage of the return value of get_unaligned_le16(), which has
> > been left as is because it has side effects on the argument it takes.
> > 
> > Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> > ---
> > 
> >  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 
9fc612fb736f..a13b3ec42bc9
> > 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > @@ -1721,7 +1721,7 @@ unsigned int OnAction_back(struct adapter *padapter, 
union
> > recv_frame *precv_fra> 
> >  	struct recv_reorder_ctrl *preorder_ctrl;
> >  	unsigned char 	*frame_body;
> >  	unsigned char 	category, action;
> > 
> > -	unsigned short	tid, status, reason_code = 0;
> > +	unsigned short	tid, status;
> > 
> >  	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> >  	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
> >  	u8 *pframe = precv_frame->u.hdr.rx_data;
> > 
> > @@ -1791,8 +1791,7 @@ unsigned int OnAction_back(struct adapter *padapter, 
union
> > recv_frame *precv_fra> 
> >  				psta->htpriv.candidate_tid_bitmap 
&=
> >  				
> >  					~BIT((frame_body[3] >> 
4) & 0xf);
> > 
> > -				/* reason_code = frame_body[4] | 
(frame_body[5] << 8); */
> > -				reason_code = 
get_unaligned_le16(&frame_body[4]);
> > +				
get_unaligned_le16(&frame_body[4]);
> 
> It doesn't have any side effects.  Just delete it too.
> 
It seems that I misinterpreted the semantics of get_unaligned_le16(). If I'm 
not still wrong the above function uses the __swab16 macro, which returns 
swapped bytes with _no_ side effects on the swapped variable.

I'm about to send a patch v2 with the deletion suggested by you.

Thanks,

Fabio
>
> regards,
> dan carpenter