2022-10-25 17:32:46

by Kang Minchul

Subject: [PATCH v3 0/4] staging: r8188eu: cleaning up unused variables

This patch series cleans up unused variables in r8188eu
causing coccicheck warnings.

Difference between this patch and previous patch is that this patch series
include making function rtw_sta_flush in r8188eu/core/rtw_ap.c
into void function.

Kang Minchul (4):
staging: r8188eu: remove unnecessary variable in ioctl_linux
staging: r8188eu: remove unnecessary vaiable in rtw_recv
staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit
staging: r8188eu: make rtw_sta_flush to void

drivers/staging/r8188eu/core/rtw_ap.c | 7 ++-----
drivers/staging/r8188eu/core/rtw_recv.c | 3 +--
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
drivers/staging/r8188eu/include/rtw_ap.h | 2 +-
drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +---
5 files changed, 6 insertions(+), 13 deletions(-)

--
2.34.1

2022-10-25 17:33:53

by Kang Minchul

Subject: [PATCH v3 2/4] staging: r8188eu: remove unnecessary vaiable in rtw_recv

Return _SUCCESS directly instead of storing it in a variable.
This can prevent cocci warning as follows:

Unneeded variable: "ret". Return "_SUCCESS" on line 1516

Signed-off-by: Kang Minchul <[email protected]>
---
v2 -> v3: rollback to v1 because v2 caused error by kernel test robot
v1 -> v2: made amsdu_to_msdu into void function

drivers/staging/r8188eu/core/rtw_recv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index bb5c3b3888e0..9e98aea09583 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -1415,7 +1415,6 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)

struct recv_priv *precvpriv = &padapter->recvpriv;
struct __queue *pfree_recv_queue = &precvpriv->free_recv_queue;
- int ret = _SUCCESS;

nr_subframes = 0;

@@ -1513,7 +1512,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
prframe->len = 0;
rtw_free_recvframe(prframe, pfree_recv_queue);/* free this recv_frame */

- return ret;
+ return _SUCCESS;
}

static bool check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
--
2.34.1

2022-10-25 17:45:22

by Kang Minchul

Subject: [PATCH v3 3/4] staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit

Return 0 directly instead of storing it in a variable.
This can prevent cocci warning as follows:

Unneeded variable: "pull". Return "0" on line 298

Signed-off-by: Kang Minchul <[email protected]>
---
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 8e4a5acc0b18..6d1f56d1f9d7 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -149,7 +149,6 @@ static void fill_txdesc_phy(struct pkt_attrib *pattrib, __le32 *pdw)

static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bagg_pkt)
{
- int pull = 0;
uint qsel;
u8 data_rate, pwr_status, offset;
struct adapter *adapt = pxmitframe->padapter;
@@ -295,7 +294,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
ODM_SetTxAntByTxInfo_88E(&haldata->odmpriv, pmem, pattrib->mac_id);

rtl8188eu_cal_txdesc_chksum(ptxdesc);
- return pull;
+ return 0;
}

/* for non-agg data frame or management frame */
--
2.34.1

2022-10-25 18:24:12

by Philipp Hortmann

Subject: Re: [PATCH v3 0/4] staging: r8188eu: cleaning up unused variables

On 10/25/22 19:06, Kang Minchul wrote:
> This patch series cleans up unused variables in r8188eu
> causing coccicheck warnings.
>
> Difference between this patch and previous patch is that this patch series
> include making function rtw_sta_flush in r8188eu/core/rtw_ap.c
> into void function.
>
> Kang Minchul (4):
> staging: r8188eu: remove unnecessary variable in ioctl_linux
> staging: r8188eu: remove unnecessary vaiable in rtw_recv
> staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit
> staging: r8188eu: make rtw_sta_flush to void
>
> drivers/staging/r8188eu/core/rtw_ap.c | 7 ++-----
> drivers/staging/r8188eu/core/rtw_recv.c | 3 +--
> drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
> drivers/staging/r8188eu/include/rtw_ap.h | 2 +-
> drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +---
> 5 files changed, 6 insertions(+), 13 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]> # Edimax N150