From nobody Sun Apr 12 07:34:44 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 1E1E3C04A68 for ; Sat, 30 Jul 2022 14:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235003AbiG3OkG (ORCPT ); Sat, 30 Jul 2022 10:40:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234095AbiG3Oj7 (ORCPT ); Sat, 30 Jul 2022 10:39:59 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9141A17AAC for ; Sat, 30 Jul 2022 07:39:58 -0700 (PDT) Received: from dslb-188-104-059-172.188.104.pools.vodafone-ip.de ([188.104.59.172] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oHndA-0004pM-LY; Sat, 30 Jul 2022 16:39:52 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/3] staging: r8188eu: make rtw_handle_dualmac a void function Date: Sat, 30 Jul 2022 16:39:38 +0200 Message-Id: <20220730143939.671951-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220730143939.671951-1-martin@kaiser.cx> References: <20220730143939.671951-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rtw_handle_dualmac function always returns _SUCCESS. Remove the return value and update the one caller that checks it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 5 +---- drivers/staging/r8188eu/include/drv_types.h | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 3a002cb6834f..235dbf353802 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1578,10 +1578,8 @@ void beacon_timing_control(struct adapter *padapter) =20 static struct adapter *pbuddy_padapter; =20 -int rtw_handle_dualmac(struct adapter *adapter, bool init) +void rtw_handle_dualmac(struct adapter *adapter, bool init) { - int status =3D _SUCCESS; - if (init) { if (!pbuddy_padapter) { pbuddy_padapter =3D adapter; @@ -1594,5 +1592,4 @@ int rtw_handle_dualmac(struct adapter *adapter, bool = init) } else { pbuddy_padapter =3D NULL; } - return status; } diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index bba88a0ede61..9f8a8d3e8f77 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -222,7 +222,7 @@ struct adapter { =20 #define adapter_to_dvobj(adapter) (adapter->dvobj) =20 -int rtw_handle_dualmac(struct adapter *adapter, bool init); +void rtw_handle_dualmac(struct adapter *adapter, bool init); =20 static inline u8 *myid(struct eeprom_priv *peepriv) { diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index e1a0447fd1e7..4dbdffa4e293 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -306,8 +306,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_pr= iv *dvobj, =20 padapter->hw_init_mutex =3D &usb_drv->hw_init_mutex; =20 - if (rtw_handle_dualmac(padapter, 1) !=3D _SUCCESS) - goto free_adapter; + rtw_handle_dualmac(padapter, 1); =20 pnetdev =3D rtw_init_netdev(padapter); if (!pnetdev) @@ -370,7 +369,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_pr= iv *dvobj, rtw_free_drv_sw(padapter); handle_dualmac: rtw_handle_dualmac(padapter, 0); -free_adapter: if (pnetdev) rtw_free_netdev(pnetdev); else --=20 2.30.2