From patchwork Tue Nov 1 16:54:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak R Varma X-Patchwork-Id: 13797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3087528wru; Tue, 1 Nov 2022 09:58:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57H8SelqEGJ6toChg//M32DeqeOLb/wqZcTsTKPNCXlAmCoivThtKT0C3qV4NiMZ9zseCP X-Received: by 2002:a05:6402:847:b0:45c:c716:4b76 with SMTP id b7-20020a056402084700b0045cc7164b76mr19992615edz.113.1667321897015; Tue, 01 Nov 2022 09:58:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667321897; cv=none; d=google.com; s=arc-20160816; b=DX97Yik4lEY3mQMWml0ad4LWFQJQnWhncu1qdICl0JkInr7z10GsiHN/0iIeMa6ugX FuvwWuRJz/ra/TIk+5FvEuEvqdSij2Sd5SLLJTh5f8nFtTVUxtNu2uoSKlOJLQHeFcuA HLkzpeBo568BGBamIyQE9zkOBMWoux99xK/I80Xv3C6cgFGpzu89nYVDUwNJIFsUzgvY 7C2ovuVlPufGIc7HWJvIIROv5jFhHojHoZg0t/CGbLNpfa9SfAT0HqbY7ZB9UeQoM/uo 6IzuBdM+f9pP9gCxXnQCtgLnNF00jRraKtvRfdWIkLlqNQS7QsPa2+Bg+yFiWWXuL82A Qb/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:to:from:date:dkim-signature; bh=CIOE2ebaPr/3PY/bmgLcKUeuQ4VuMG6R3hNcQq1DBuY=; b=cMt7GlqQiGMrGdNqXJl5AfJm5vC12fHM9AquCoxIZXMFs5F7oJZeZOdE2YoLk3dtQ5 cFZ8CPq9oYLXhdXEZvAIhSDVhDfFbZgP6nclo6fr1/KPCCcZdvAfAOKHqjTN6UMvxn5C 67yu58cLkZsDSyL72m0du8V8NV0AjUjlzoBsZ9qKhxxrXZjXWtBUZocSPiOuV35IQHfM QOCKEcpDiOy7PmDu2ZCe/3PEN3grac1YNiFAkGW+MoN58Lq+HpT4EDlHqA/hgaUjb5HD 6/tPfMQ63o4NFqQ03IkYaYzcdJMI+ss8lSwPSxh+3Xt14G0mbRqGtUBZPZJaafLPq0t+ xkDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailo.com header.s=mailo header.b=lsd009h8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v21-20020aa7d655000000b0045a11b60c57si11045391edr.121.2022.11.01.09.57.53; Tue, 01 Nov 2022 09:58:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@mailo.com header.s=mailo header.b=lsd009h8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbiKAQym (ORCPT + 99 others); Tue, 1 Nov 2022 12:54:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230498AbiKAQyi (ORCPT ); Tue, 1 Nov 2022 12:54:38 -0400 Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6A231D0EF for ; Tue, 1 Nov 2022 09:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1667321661; bh=8YVJzLkjok9FyytutsxVxX0mBcAacup22qHtrQ8O00Y=; h=X-EA-Auth:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type; b=lsd009h845o8RntXvfoTseq4TnGtfrVtg3PeO7F3Pq+MGcKFG5fP0Ydy0LUllFoEz CB1zCkQTMkyF/hbG+BlB4ZhaMbH/tZWNTSUM7250NiM/JzNY6VN1ikZfFKroGIJ8Kd h5p9IYx5XKTy2BmIEPQimvap9IXkylvRoP7TnjWE= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via [213.182.55.206] Tue, 1 Nov 2022 17:54:21 +0100 (CET) X-EA-Auth: rv1lLadpktQ6bGQclQZze9gI4h6PWCVMTYUQPJBBxg7btmUvoVeAv6vc2LMERn3jWltxUINSBnuu0cCzAvsMYa5mjEPAP/A0 Date: Tue, 1 Nov 2022 22:24:16 +0530 From: Deepak R Varma To: outreachy@lists.linux.dev, Larry Finger , Phillip Potter , Pavel Skripkin , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: r8188eu: remove unwanted variable implementation Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748313725886826252?= X-GMAIL-MSGID: =?utf-8?q?1748313725886826252?= Local variables intended as the function return value are initialized but their value does not change during function execution. The initial value assigned to the variable is simply returned to the caller. This makes the variable declaration unnecessary and the initial value can be directly returned. The patch is produced using the following coccicheck options: COCCI=./scripts/coccinelle/misc/returnvar.cocci M=driver/staging/r8188eu/ MODE=patch Signed-off-by: Deepak R Varma --- drivers/staging/r8188eu/core/rtw_ap.c | 5 ++--- drivers/staging/r8188eu/core/rtw_recv.c | 3 +-- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +-- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) -- 2.34.1 diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c index 24eb8dce9bfe..9eaf345e6a00 100644 --- a/drivers/staging/r8188eu/core/rtw_ap.c +++ b/drivers/staging/r8188eu/core/rtw_ap.c @@ -1020,7 +1020,6 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, int rtw_sta_flush(struct adapter *padapter) { struct list_head *phead, *plist; - int ret = 0; struct sta_info *psta = NULL; struct sta_priv *pstapriv = &padapter->stapriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1028,7 +1027,7 @@ int rtw_sta_flush(struct adapter *padapter) u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE) - return ret; + return 0; spin_lock_bh(&pstapriv->asoc_list_lock); phead = &pstapriv->asoc_list; @@ -1051,7 +1050,7 @@ int rtw_sta_flush(struct adapter *padapter) associated_clients_update(padapter, true); - return ret; + return 0; } /* called > TSR LEVEL for USB or SDIO Interface*/ diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 4b68a543f68b..94f85cd7038d 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) 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 */ diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c index 8516e253bb03..59a97c5fb80c 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -2979,8 +2979,6 @@ static int rtw_p2p_set(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - int ret = 0; - if (!memcmp(extra, "enable =", 7)) { rtw_wext_p2p_enable(dev, info, wrqu, &extra[7]); } else if (!memcmp(extra, "setDN =", 6)) { @@ -3027,7 +3025,7 @@ static int rtw_p2p_set(struct net_device *dev, rtw_p2p_set_persistent(dev, info, wrqu, &extra[11]); } - return ret; + return 0; } static int rtw_p2p_get2(struct net_device *dev,