[PATCH 0/7] Fixup unused variables and warnings

[PATCH 0/7] Fixup unused variables and warnings

[Phillip Potter]

This series fixes an empty goto label by removing it and converting its
associated goto to a return. It also changes a decrement operator to
prefix to make it clearer, and provide expected behaviour. Finally, it
removes a lot of unused variables warned about by the kernel test robot,
which are a result of my previous DBG_88E removal series, and removes an
entire function as well which is surplus to requirements.

Phillip Potter (7):
  staging: rtl8188eu: remove empty label from
    mlmeext_joinbss_event_callback
  staging: rtl8188eu: use prefix decrement operator on trycnt variable
  staging: rtl8188eu: remove unused variables from core/rtw_efuse.c
  staging: rtl8188eu: remove unused variables from core/rtw_mlme_ext.c
  staging: rtl8188eu: remove unused variable from os_dep/ioctl_linux.c
  staging: rtl8188eu: remove unused variables from hal/rtl8188e_cmd.c
  staging: rtl8188eu: remove _dbg_dump_tx_info function

 drivers/staging/rtl8188eu/core/rtw_efuse.c    | 11 ++--------
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 20 +++++--------------
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c  |  4 ----
 drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 17 ----------------
 .../staging/rtl8188eu/hal/rtl8188eu_xmit.c    |  1 -
 drivers/staging/rtl8188eu/hal/usb_halinit.c   |  2 +-
 .../staging/rtl8188eu/include/rtl8188e_xmit.h |  3 ---
 .../staging/rtl8188eu/os_dep/ioctl_linux.c    |  3 ---
 8 files changed, 8 insertions(+), 53 deletions(-)

-- 
2.30.2

[PATCH 1/7] staging: rtl8188eu: remove empty label from mlmeext_joinbss_event_callback

[Phillip Potter]

Remove empty label at end of mlmeext_joinbss_event_callback function, as
it only contained a return in my last patch to make the code build. It
is better removed, and the corresponding goto converted to a return.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 6107257900c2..d41fd0b8980a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4253,7 +4253,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 		/* restore to initial setting. */
 		update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
 
-		goto exit_mlmeext_joinbss_event_callback;
+		return;
 	}
 
 	if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
@@ -4309,9 +4309,6 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 		correct_TSF(padapter, pmlmeext);
 	}
 	rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
-
-exit_mlmeext_joinbss_event_callback:
-	return;
 }
 
 void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *psta)
-- 
2.30.2

[PATCH 2/7] staging: rtl8188eu: use prefix decrement operator on trycnt variable

[Phillip Potter]

Modify trycnt condition in the do/while loop of rtw_hal_set_hwreg to use
a prefix decrement operator instead of postfix. As an unsigned 8-bit
integer, this value would actually be 255 after the end of the do/while
loop, which is almost certainly not what was intended. It is more
reasonable to assume a loop counter should be zero at the end of all
loop iterations. Indeed, the line following the loop previously contained
an if statement which assumed trycnt was 0, and therefore was never
triggered.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 0c3f11411eae..dcdf868b394d 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1657,7 +1657,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
 				do {
 					if (!(usb_read32(Adapter, REG_RXPKT_NUM) & RXDMA_IDLE))
 						break;
-				} while (trycnt--);
+				} while (--trycnt);
 
 				/* RQPN Load 0 */
 				usb_write16(Adapter, REG_RQPN_NPQ, 0x0);
-- 
2.30.2

[PATCH 3/7] staging: rtl8188eu: remove unused variables from core/rtw_efuse.c

[Phillip Potter]

Remove set but unused variables from within the file core/rtw_efuse.c
in the function efuse_read_phymap_from_txpktbuf, as they are triggering
kernel test robot warnings. Also, remove the local 'lenc' array as well,
as nothing is done with its values. Keep the two usb_read8 calls
however, as this patch is purely for warnings, not to change behaviour
of the code.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 0d51bf9c9bb0..21619fd67217 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -234,16 +234,9 @@ static void efuse_read_phymap_from_txpktbuf(
 		hi32 = usb_read32(adapter, REG_PKTBUF_DBG_DATA_H);
 
 		if (i == 0) {
-			u8 lenc[2];
-			u16 lenbak, aaabak;
-			u16 aaa;
+			usb_read8(adapter, REG_PKTBUF_DBG_DATA_L);
+			usb_read8(adapter, REG_PKTBUF_DBG_DATA_L + 1);
 
-			lenc[0] = usb_read8(adapter, REG_PKTBUF_DBG_DATA_L);
-			lenc[1] = usb_read8(adapter, REG_PKTBUF_DBG_DATA_L + 1);
-
-			aaabak = le16_to_cpup((__le16 *)lenc);
-			lenbak = le16_to_cpu(*((__le16 *)lenc));
-			aaa = le16_to_cpup((__le16 *)&lo32);
 			len = le16_to_cpu(*((__le16 *)&lo32));
 
 			limit = min_t(u16, len - 2, limit);
-- 
2.30.2

[PATCH 4/7] staging: rtl8188eu: remove unused variables from core/rtw_mlme_ext.c

[Phillip Potter]

Remove set but unused variables from within the file core/rtw_mlme_ext.c,
as they are triggering kernel test robot warnings.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index d41fd0b8980a..c6410030dcbf 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -1767,8 +1767,6 @@ unsigned int send_beacon(struct adapter *padapter)
 	u8 bxmitok = false;
 	int issue = 0;
 	int poll = 0;
-	unsigned long start = jiffies;
-	u32 passing_time;
 
 	rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
 	do {
@@ -1785,7 +1783,6 @@ unsigned int send_beacon(struct adapter *padapter)
 		return _FAIL;
 	if (!bxmitok)
 		return _FAIL;
-	passing_time = jiffies_to_msecs(jiffies - start);
 
 	return _SUCCESS;
 }
@@ -2756,7 +2753,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
 	u16 capab_info;
 	struct rtw_ieee802_11_elems elems;
 	struct sta_info *pstat;
-	unsigned char reassoc, *p, *pos, *wpa_ie;
+	unsigned char *p, *pos, *wpa_ie;
 	unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};
 	int i, wpa_ie_len, left;
 	unsigned char supportRate[16];
@@ -2776,13 +2773,10 @@ static unsigned int OnAssocReq(struct adapter *padapter,
 		return _FAIL;
 
 	frame_type = GetFrameSubType(pframe);
-	if (frame_type == IEEE80211_STYPE_ASSOC_REQ) {
-		reassoc = 0;
+	if (frame_type == IEEE80211_STYPE_ASSOC_REQ)
 		ie_offset = _ASOCREQ_IE_OFFSET_;
-	} else { /*  IEEE80211_STYPE_REASSOC_REQ */
-		reassoc = 1;
+	else /*  IEEE80211_STYPE_REASSOC_REQ */
 		ie_offset = _REASOCREQ_IE_OFFSET_;
-	}
 
 	if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset)
 		return _FAIL;
@@ -3397,7 +3391,7 @@ static unsigned int OnAction_back(struct adapter *padapter,
 	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->pkt->data;
@@ -3449,7 +3443,6 @@ static unsigned int OnAction_back(struct adapter *padapter,
 			if ((frame_body[3] & BIT(3)) == 0) {
 				psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
 				psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
-				reason_code = get_unaligned_le16(&frame_body[4]);
 			} else if ((frame_body[3] & BIT(3)) == BIT(3)) {
 				tid = (frame_body[3] >> 4) & 0x0F;
 				preorder_ctrl =  &psta->recvreorder_ctrl[tid];
-- 
2.30.2

[PATCH 5/7] staging: rtl8188eu: remove unused variable from os_dep/ioctl_linux.c

[Phillip Potter]

Remove set but unused variable 'reason' from within the file
os_dep/ioctl_linux.c in the function rtw_wx_set_mlme, as it is
triggering a kernel test robot warning.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 12f845c17aa5..3b8386245017 100644
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -978,15 +978,12 @@ static int rtw_wx_set_mlme(struct net_device *dev,
 			   union iwreq_data *wrqu, char *extra)
 {
 	int ret = 0;
-	u16 reason;
 	struct adapter *padapter = netdev_priv(dev);
 	struct iw_mlme *mlme = (struct iw_mlme *)extra;
 
 	if (!mlme)
 		return -1;
 
-	reason = mlme->reason_code;
-
 	switch (mlme->cmd) {
 	case IW_MLME_DEAUTH:
 		if (!rtw_set_802_11_disassociate(padapter))
-- 
2.30.2

[PATCH 6/7] staging: rtl8188eu: remove unused variables from hal/rtl8188e_cmd.c

[Phillip Potter]

Remove set but unused variables from within the file hal/rtl8188e_cmd.c
in the function rtl8188e_set_FwMediaStatus_cmd, as they are triggering
kernel test robot warnings.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index 19c8976c2e01..f2969e160ac3 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -177,12 +177,8 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
 
 void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
 {
-	u8 opmode, macid;
 	u16 mst_rpt = le16_to_cpu(mstatus_rpt);
 
-	opmode = (u8)mst_rpt;
-	macid = (u8)(mst_rpt >> 8);
-
 	FillH2CCmd_88E(adapt, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
 }
 
-- 
2.30.2

[PATCH 7/7] staging: rtl8188eu: remove _dbg_dump_tx_info function

[Phillip Potter]

Remove the _dbg_dump_tx_info function from hal/rtl8188e_xmit.c, as
it doesn't actually do anything and is only called from one place.
It used to have some redundant debugging statements in it, but these
have now been removed anyway, so all it does is read information from
the adapter to set a variable 'dump_txdesc' which is then never used.
This fixes a kernel test robot warning.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c   | 17 -----------------
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c  |  1 -
 .../staging/rtl8188eu/include/rtl8188e_xmit.h   |  3 ---
 3 files changed, 21 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c
index 0d5608766a0e..efa8960a7eb5 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c
@@ -23,20 +23,3 @@ void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf)
 					RTW_SCTX_DONE_CCX_PKT_FAIL);
 	}
 }
-
-void _dbg_dump_tx_info(struct adapter *padapter, int frame_tag,
-		       struct tx_desc *ptxdesc)
-{
-	u8 dmp_txpkt;
-	bool dump_txdesc = false;
-
-	rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(dmp_txpkt));
-
-	if (dmp_txpkt == 1) {/* dump txdesc for data frame */
-		if ((frame_tag & 0x0f) == DATA_FRAMETAG)
-			dump_txdesc = true;
-	} else if (dmp_txpkt == 2) {/* dump txdesc for mgnt frame */
-		if ((frame_tag & 0x0f) == MGNT_FRAMETAG)
-			dump_txdesc = true;
-	}
-}
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index 7ca0a45dd0c7..729d3bbf4343 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -318,7 +318,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
 	rtl88eu_dm_set_tx_ant_by_tx_info(odmpriv, pmem, pattrib->mac_id);
 
 	rtl8188eu_cal_txdesc_chksum(ptxdesc);
-	_dbg_dump_tx_info(adapt, pxmitframe->frame_tag, ptxdesc);
 	return pull;
 }
 
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
index 617c2273b41b..72a2bb812c9a 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
@@ -154,7 +154,4 @@ bool rtl8188eu_xmitframe_complete(struct adapter *padapter,
 
 void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf);
 
-void _dbg_dump_tx_info(struct adapter *padapter, int frame_tag,
-		       struct tx_desc *ptxdesc);
-
 #endif /* __RTL8188E_XMIT_H__ */
-- 
2.30.2

Re: [PATCH 0/7] Fixup unused variables and warnings

[Greg KH]

On Tue, Jun 15, 2021 at 11:36:00PM +0100, Phillip Potter wrote:
> This series fixes an empty goto label by removing it and converting its
> associated goto to a return. It also changes a decrement operator to
> prefix to make it clearer, and provide expected behaviour. Finally, it
> removes a lot of unused variables warned about by the kernel test robot,
> which are a result of my previous DBG_88E removal series, and removes an
> entire function as well which is surplus to requirements.
> 
> Phillip Potter (7):
>   staging: rtl8188eu: remove empty label from
>     mlmeext_joinbss_event_callback
>   staging: rtl8188eu: use prefix decrement operator on trycnt variable
>   staging: rtl8188eu: remove unused variables from core/rtw_efuse.c
>   staging: rtl8188eu: remove unused variables from core/rtw_mlme_ext.c
>   staging: rtl8188eu: remove unused variable from os_dep/ioctl_linux.c
>   staging: rtl8188eu: remove unused variables from hal/rtl8188e_cmd.c
>   staging: rtl8188eu: remove _dbg_dump_tx_info function

In the future, can you use "staging: rtl8188eu:" on the prefix of your
0/X email so these can be caught easier by those of us who filter on
stuff like this?

And thanks for fixing these so quickly, I'll go apply them now.

thanks,

greg k-h

Re: [PATCH 0/7] Fixup unused variables and warnings

[Phillip Potter]

On Wed, Jun 16, 2021 at 09:24:25AM +0200, Greg KH wrote:
> On Tue, Jun 15, 2021 at 11:36:00PM +0100, Phillip Potter wrote:
> > This series fixes an empty goto label by removing it and converting its
> > associated goto to a return. It also changes a decrement operator to
> > prefix to make it clearer, and provide expected behaviour. Finally, it
> > removes a lot of unused variables warned about by the kernel test robot,
> > which are a result of my previous DBG_88E removal series, and removes an
> > entire function as well which is surplus to requirements.
> > 
> > Phillip Potter (7):
> >   staging: rtl8188eu: remove empty label from
> >     mlmeext_joinbss_event_callback
> >   staging: rtl8188eu: use prefix decrement operator on trycnt variable
> >   staging: rtl8188eu: remove unused variables from core/rtw_efuse.c
> >   staging: rtl8188eu: remove unused variables from core/rtw_mlme_ext.c
> >   staging: rtl8188eu: remove unused variable from os_dep/ioctl_linux.c
> >   staging: rtl8188eu: remove unused variables from hal/rtl8188e_cmd.c
> >   staging: rtl8188eu: remove _dbg_dump_tx_info function
> 
> In the future, can you use "staging: rtl8188eu:" on the prefix of your
> 0/X email so these can be caught easier by those of us who filter on
> stuff like this?
> 
> And thanks for fixing these so quickly, I'll go apply them now.
> 
> thanks,
> 
> greg k-h

Dear Greg,

Yes, absolutely, my apologies. I don't know why I wasn't doing this
already, seems obvious in hindsight - I put it down to my brain
malfunctioning :-) Many thanks for taking the patches.

Regards,
Phil