This commit makes amsdu_to_msdu into void function in order to
prevent cocci warning as follows:
Unneeded variable: "ret". Return "_SUCCESS" on line 1516
Signed-off-by: Kang Minchul <[email protected]>
---
Changes since v1:
* made function amsdu_to_msdu void
drivers/staging/r8188eu/core/rtw_recv.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index bb5c3b3888e0..a0d7cf08f933 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -1404,7 +1404,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter, struct recv_fr
return prtnframe;
}
-static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
+static void amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
{
int a_len, padding_len;
u16 eth_type, nSubframe_Length;
@@ -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;
@@ -1512,8 +1511,6 @@ 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;
}
static bool check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
--
2.34.1
Hi Kang,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Kang-Minchul/staging-r8188eu-cleaning-up-unused-variables/20221024-165150
patch link: https://lore.kernel.org/r/20221024084925.262289-3-tegongkang%40gmail.com
patch subject: [PATCH v2 2/4] staging: r8188eu: make amsdu_to_msdu void function
config: powerpc-allmodconfig
compiler: powerpc-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/60b9b9d5695d036f79276171a35d45034adc07cf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Kang-Minchul/staging-r8188eu-cleaning-up-unused-variables/20221024-165150
git checkout 60b9b9d5695d036f79276171a35d45034adc07cf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash drivers/staging/r8188eu/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
drivers/staging/r8188eu/core/rtw_recv.c: In function 'recv_indicatepkts_in_order':
>> drivers/staging/r8188eu/core/rtw_recv.c:1697:37: error: void value not ignored as it ought to be
1697 | if (amsdu_to_msdu(padapter, prframe) != _SUCCESS)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/r8188eu/core/rtw_recv.c: In function 'recv_indicatepkt_reorder':
drivers/staging/r8188eu/core/rtw_recv.c:1745:32: error: void value not ignored as it ought to be
1745 | retval = amsdu_to_msdu(padapter, prframe);
| ^
vim +1697 drivers/staging/r8188eu/core/rtw_recv.c
183f1e8d78dee3 Michael Straube 2022-08-07 1653
10b4f58f2ef209 Vihas Makwana 2022-03-03 1654 static bool recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
15865124feed88 Phillip Potter 2021-07-28 1655 {
15865124feed88 Phillip Potter 2021-07-28 1656 struct list_head *phead, *plist;
15865124feed88 Phillip Potter 2021-07-28 1657 struct recv_frame *prframe;
15865124feed88 Phillip Potter 2021-07-28 1658 struct rx_pkt_attrib *pattrib;
15865124feed88 Phillip Potter 2021-07-28 1659 int bPktInBuf = false;
15865124feed88 Phillip Potter 2021-07-28 1660 struct recv_priv *precvpriv = &padapter->recvpriv;
15865124feed88 Phillip Potter 2021-07-28 1661 struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
15865124feed88 Phillip Potter 2021-07-28 1662
15865124feed88 Phillip Potter 2021-07-28 1663 phead = get_list_head(ppending_recvframe_queue);
15865124feed88 Phillip Potter 2021-07-28 1664 plist = phead->next;
15865124feed88 Phillip Potter 2021-07-28 1665
15865124feed88 Phillip Potter 2021-07-28 1666 /* Handling some condition for forced indicate case. */
15865124feed88 Phillip Potter 2021-07-28 1667 if (bforced) {
15865124feed88 Phillip Potter 2021-07-28 1668 if (list_empty(phead))
15865124feed88 Phillip Potter 2021-07-28 1669 return true;
15865124feed88 Phillip Potter 2021-07-28 1670
15865124feed88 Phillip Potter 2021-07-28 1671 prframe = container_of(plist, struct recv_frame, list);
15865124feed88 Phillip Potter 2021-07-28 1672 pattrib = &prframe->attrib;
15865124feed88 Phillip Potter 2021-07-28 1673 preorder_ctrl->indicate_seq = pattrib->seq_num;
15865124feed88 Phillip Potter 2021-07-28 1674 }
15865124feed88 Phillip Potter 2021-07-28 1675
15865124feed88 Phillip Potter 2021-07-28 1676 /* Prepare indication list and indication. */
15865124feed88 Phillip Potter 2021-07-28 1677 /* Check if there is any packet need indicate. */
15865124feed88 Phillip Potter 2021-07-28 1678 while (!list_empty(phead)) {
15865124feed88 Phillip Potter 2021-07-28 1679 prframe = container_of(plist, struct recv_frame, list);
15865124feed88 Phillip Potter 2021-07-28 1680 pattrib = &prframe->attrib;
15865124feed88 Phillip Potter 2021-07-28 1681
15865124feed88 Phillip Potter 2021-07-28 1682 if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) {
15865124feed88 Phillip Potter 2021-07-28 1683 plist = plist->next;
79c35b74513b5b Michael Straube 2021-08-09 1684 list_del_init(&prframe->list);
15865124feed88 Phillip Potter 2021-07-28 1685
15865124feed88 Phillip Potter 2021-07-28 1686 if (SN_EQUAL(preorder_ctrl->indicate_seq, pattrib->seq_num))
15865124feed88 Phillip Potter 2021-07-28 1687 preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
15865124feed88 Phillip Potter 2021-07-28 1688
15865124feed88 Phillip Potter 2021-07-28 1689 /* Set this as a lock to make sure that only one thread is indicating packet. */
15865124feed88 Phillip Potter 2021-07-28 1690
15865124feed88 Phillip Potter 2021-07-28 1691 /* indicate this recv_frame */
15865124feed88 Phillip Potter 2021-07-28 1692 if (!pattrib->amsdu) {
15865124feed88 Phillip Potter 2021-07-28 1693 if ((!padapter->bDriverStopped) &&
15865124feed88 Phillip Potter 2021-07-28 1694 (!padapter->bSurpriseRemoved))
15865124feed88 Phillip Potter 2021-07-28 1695 rtw_recv_indicatepkt(padapter, prframe);/* indicate this recv_frame */
15865124feed88 Phillip Potter 2021-07-28 1696 } else if (pattrib->amsdu == 1) {
15865124feed88 Phillip Potter 2021-07-28 @1697 if (amsdu_to_msdu(padapter, prframe) != _SUCCESS)
15865124feed88 Phillip Potter 2021-07-28 1698 rtw_free_recvframe(prframe, &precvpriv->free_recv_queue);
15865124feed88 Phillip Potter 2021-07-28 1699 } else {
15865124feed88 Phillip Potter 2021-07-28 1700 /* error condition; */
15865124feed88 Phillip Potter 2021-07-28 1701 }
15865124feed88 Phillip Potter 2021-07-28 1702
15865124feed88 Phillip Potter 2021-07-28 1703 /* Update local variables. */
15865124feed88 Phillip Potter 2021-07-28 1704 bPktInBuf = false;
15865124feed88 Phillip Potter 2021-07-28 1705 } else {
15865124feed88 Phillip Potter 2021-07-28 1706 bPktInBuf = true;
15865124feed88 Phillip Potter 2021-07-28 1707 break;
15865124feed88 Phillip Potter 2021-07-28 1708 }
15865124feed88 Phillip Potter 2021-07-28 1709 }
15865124feed88 Phillip Potter 2021-07-28 1710 return bPktInBuf;
15865124feed88 Phillip Potter 2021-07-28 1711 }
15865124feed88 Phillip Potter 2021-07-28 1712
--
0-DAY CI Kernel Test Service
https://01.org/lkp