From nobody Fri Jun 19 20:15:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C26CC433FE for ; Wed, 30 Mar 2022 01:29:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241639AbiC3Ba5 (ORCPT ); Tue, 29 Mar 2022 21:30:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239352AbiC3Baz (ORCPT ); Tue, 29 Mar 2022 21:30:55 -0400 Received: from mail.meizu.com (edge07.meizu.com [112.91.151.210]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3530B1A9F for ; Tue, 29 Mar 2022 18:29:10 -0700 (PDT) Received: from IT-EXMB-1-125.meizu.com (172.16.1.125) by mz-mail11.meizu.com (172.16.1.15) with Microsoft SMTP Server (TLS) id 14.3.487.0; Wed, 30 Mar 2022 09:29:03 +0800 Received: from meizu.meizu.com (172.16.137.70) by IT-EXMB-1-125.meizu.com (172.16.1.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Wed, 30 Mar 2022 09:29:01 +0800 From: Haowen Bai To: Larry Finger , Phillip Potter , Greg Kroah-Hartman CC: Haowen Bai , , Subject: [PATCH V4] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable Date: Wed, 30 Mar 2022 09:28:59 +0800 Message-ID: <1648603740-14760-1-git-send-email-baihaowen@meizu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.137.70] X-ClientProxiedBy: IT-EXMB-1-125.meizu.com (172.16.1.125) To IT-EXMB-1-125.meizu.com (172.16.1.125) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As init_mlme_ext_priv function always returns SUCCESS , We can change return type from int to void. fixes coccinelle warning: ./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "= res". Return "_SUCCESS" on line 380 Signed-off-by: Haowen Bai Reviewed-by: Dan Carpenter --- V1->V2: split into two patches. V2->V3: change return type from int to void. V3->V4: just delete the unused label but don't delete the free function. drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +---- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 10d5f12..ff48293 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -352,9 +352,8 @@ static u8 init_channel_set(struct adapter *padapter, u8= ChannelPlan, struct rt_c return chanset_size; } =20 -int init_mlme_ext_priv(struct adapter *padapter) +void init_mlme_ext_priv(struct adapter *padapter) { - int res =3D _SUCCESS; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -376,8 +375,6 @@ int init_mlme_ext_priv(struct adapter *padapter) pmlmeext->mlmeext_init =3D true; =20 pmlmeext->active_keep_alive_check =3D true; - - return res; } =20 void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 0c555ea..827ac6c 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -419,7 +419,7 @@ struct mlme_ext_priv { u8 active_keep_alive_check; }; =20 -int init_mlme_ext_priv(struct adapter *adapter); +void init_mlme_ext_priv(struct adapter *adapter); int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); extern void init_mlme_ext_timer(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 550721e..c531504 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -490,10 +490,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) init_wifidirect_info(padapter, P2P_ROLE_DISABLE); reset_global_wifidirect_info(padapter); =20 - if (init_mlme_ext_priv(padapter) =3D=3D _FAIL) { - dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n"); - goto free_mlme_priv; - } + init_mlme_ext_priv(padapter); =20 if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) =3D=3D _FAIL) { dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n"); @@ -534,7 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter) free_mlme_ext: free_mlme_ext_priv(&padapter->mlmeextpriv); =20 -free_mlme_priv: rtw_free_mlme_priv(&padapter->mlmepriv); =20 free_evt_priv: --=20 2.7.4