From nobody Wed Jul 1 16:36:18 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 409B8C433F5 for ; Sat, 18 Dec 2021 12:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233038AbhLRMEo (ORCPT ); Sat, 18 Dec 2021 07:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233027AbhLRMEl (ORCPT ); Sat, 18 Dec 2021 07:04:41 -0500 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 ACBC6C061574 for ; Sat, 18 Dec 2021 04:04:40 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYS4-0008I6-SR; Sat, 18 Dec 2021 13:04:36 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 1/9] staging: r8188: make rx signal strength function static Date: Sat, 18 Dec 2021 13:04:15 +0100 Message-Id: <20211218120423.29906-2-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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 _linked_rx_signal_strength_display function is used only in rtw_mlme_ext.c. Make the function static and remove the prototype. While at it, fix a typo in the function name. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 8e04238fb5fc..0aa958f20cd6 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7124,8 +7124,7 @@ void mlmeext_sta_del_event_callback(struct adapter *p= adapter) Following are the functions for the timer handlers =20 **************************************************************************= ***/ -void _linked_rx_signal_strehgth_display(struct adapter *padapter); -void _linked_rx_signal_strehgth_display(struct adapter *padapter) +static void _linked_rx_signal_strength_display(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; @@ -7186,7 +7185,7 @@ void linked_status_chk(struct adapter *padapter) struct sta_priv *pstapriv =3D &padapter->stapriv; =20 if (padapter->bRxRSSIDisplay) - _linked_rx_signal_strehgth_display(padapter); + _linked_rx_signal_strength_display(padapter); =20 rtl8188e_sreset_linked_status_check(padapter); =20 --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 5CEAAC433FE for ; Sat, 18 Dec 2021 12:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233051AbhLRMEt (ORCPT ); Sat, 18 Dec 2021 07:04:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233048AbhLRMEr (ORCPT ); Sat, 18 Dec 2021 07:04:47 -0500 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 0B592C061574 for ; Sat, 18 Dec 2021 04:04:47 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSA-0008I6-Tu; Sat, 18 Dec 2021 13:04:42 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/9] staging: r8188: remove the dummy ioctl handler Date: Sat, 18 Dec 2021 13:04:16 +0100 Message-Id: <20211218120423.29906-3-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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 r8188 driver installs a dummy handler for some unused ioctls. All that the dummy handler does is return -1. Remove the dummy handler and let the wext core handle unused ioctls. This way, user space gets a consistent errno for an unused wext ioctl, regardless of which driver is used for the interface. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index 77728ba78d76..e7f35143dfe1 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -2096,12 +2096,6 @@ static int rtw_wx_priv_null(struct net_device *dev, = struct iw_request_info *a, return -1; } =20 -static int dummy(struct net_device *dev, struct iw_request_info *a, - union iwreq_data *wrqu, char *b) -{ - return -1; -} - static int rtw_wx_set_channel_plan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -4274,26 +4268,19 @@ static int rtw_test( =20 static iw_handler rtw_handlers[] =3D { IW_HANDLER(SIOCGIWNAME, rtw_wx_get_name), - IW_HANDLER(SIOCSIWNWID, dummy), - IW_HANDLER(SIOCGIWNWID, dummy), IW_HANDLER(SIOCGIWFREQ, rtw_wx_get_freq), IW_HANDLER(SIOCSIWMODE, rtw_wx_set_mode), IW_HANDLER(SIOCGIWMODE, rtw_wx_get_mode), - IW_HANDLER(SIOCSIWSENS, dummy), IW_HANDLER(SIOCGIWSENS, rtw_wx_get_sens), IW_HANDLER(SIOCGIWRANGE, rtw_wx_get_range), IW_HANDLER(SIOCSIWPRIV, rtw_wx_set_priv), - IW_HANDLER(SIOCSIWSPY, dummy), - IW_HANDLER(SIOCGIWSPY, dummy), IW_HANDLER(SIOCSIWAP, rtw_wx_set_wap), IW_HANDLER(SIOCGIWAP, rtw_wx_get_wap), IW_HANDLER(SIOCSIWMLME, rtw_wx_set_mlme), - IW_HANDLER(SIOCGIWAPLIST, dummy), IW_HANDLER(SIOCSIWSCAN, rtw_wx_set_scan), IW_HANDLER(SIOCGIWSCAN, rtw_wx_get_scan), IW_HANDLER(SIOCSIWESSID, rtw_wx_set_essid), IW_HANDLER(SIOCGIWESSID, rtw_wx_get_essid), - IW_HANDLER(SIOCSIWNICKN, dummy), IW_HANDLER(SIOCGIWNICKN, rtw_wx_get_nick), IW_HANDLER(SIOCSIWRATE, rtw_wx_set_rate), IW_HANDLER(SIOCGIWRATE, rtw_wx_get_rate), @@ -4301,13 +4288,9 @@ static iw_handler rtw_handlers[] =3D { IW_HANDLER(SIOCGIWRTS, rtw_wx_get_rts), IW_HANDLER(SIOCSIWFRAG, rtw_wx_set_frag), IW_HANDLER(SIOCGIWFRAG, rtw_wx_get_frag), - IW_HANDLER(SIOCSIWTXPOW, dummy), - IW_HANDLER(SIOCGIWTXPOW, dummy), - IW_HANDLER(SIOCSIWRETRY, dummy), IW_HANDLER(SIOCGIWRETRY, rtw_wx_get_retry), IW_HANDLER(SIOCSIWENCODE, rtw_wx_set_enc), IW_HANDLER(SIOCGIWENCODE, rtw_wx_get_enc), - IW_HANDLER(SIOCSIWPOWER, dummy), IW_HANDLER(SIOCGIWPOWER, rtw_wx_get_power), IW_HANDLER(SIOCSIWGENIE, rtw_wx_set_gen_ie), IW_HANDLER(SIOCSIWAUTH, rtw_wx_set_auth), --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 746BEC433EF for ; Sat, 18 Dec 2021 12:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233108AbhLRMEw (ORCPT ); Sat, 18 Dec 2021 07:04:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233044AbhLRMEt (ORCPT ); Sat, 18 Dec 2021 07:04:49 -0500 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 959B0C061574 for ; Sat, 18 Dec 2021 04:04:48 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSC-0008I6-KJ; Sat, 18 Dec 2021 13:04:44 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/9] staging: r8188: antAveRSSI is set but not used Date: Sat, 18 Dec 2021 13:04:17 +0100 Message-Id: <20211218120423.29906-4-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" antAveRSSI in struct fast_ant_train is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r= 8188eu/hal/odm_RTL8188E.c index 837e5a850264..1be662b62e51 100644 --- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c @@ -63,7 +63,6 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct = *dm_odm) dm_fat_tbl->Bssid[i] =3D 0; dm_fat_tbl->antSumRSSI[i] =3D 0; dm_fat_tbl->antRSSIcnt[i] =3D 0; - dm_fat_tbl->antAveRSSI[i] =3D 0; } dm_fat_tbl->TrainIdx =3D 0; dm_fat_tbl->FAT_State =3D FAT_NORMAL_STATE; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 69faf8b50996..c77c5c1fbe7f 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -414,7 +414,6 @@ struct fast_ant_train { u8 antsel_rx_keep_2; u32 antSumRSSI[7]; u32 antRSSIcnt[7]; - u32 antAveRSSI[7]; u8 FAT_State; u32 TrainIdx; u8 antsel_a[ODM_ASSOCIATE_ENTRY_NUM]; --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 29E0EC433FE for ; Sat, 18 Dec 2021 12:05:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233145AbhLRMFA (ORCPT ); Sat, 18 Dec 2021 07:05:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233065AbhLRMEu (ORCPT ); Sat, 18 Dec 2021 07:04:50 -0500 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 A93B2C061574 for ; Sat, 18 Dec 2021 04:04:49 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSD-0008I6-LB; Sat, 18 Dec 2021 13:04:45 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 4/9] staging: r8188: antRSSIcnt is set but not used Date: Sat, 18 Dec 2021 13:04:18 +0100 Message-Id: <20211218120423.29906-5-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" antRSSIcnt in struct fast_ant_train is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 1 - drivers/staging/r8188eu/hal/odm_RTL8188E.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 3125886e6731..021df3c8519f 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -258,7 +258,6 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct = *dm_odm, (pDM_FatTable->antsel_rx_keep_1 << 1) | pDM_FatTable->antsel_rx_keep_0; pDM_FatTable->antSumRSSI[antsel_tr_mux] +=3D pPhyInfo->RxPWDBAll; - pDM_FatTable->antRSSIcnt[antsel_tr_mux]++; } } } else if ((dm_odm->AntDivType =3D=3D CG_TRX_HW_ANTDIV) || (dm_odm->AntDi= vType =3D=3D CGCS_RX_HW_ANTDIV)) { diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r= 8188eu/hal/odm_RTL8188E.c index 1be662b62e51..848e301efc66 100644 --- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c @@ -62,7 +62,6 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct = *dm_odm) for (i =3D 0; i < 6; i++) { dm_fat_tbl->Bssid[i] =3D 0; dm_fat_tbl->antSumRSSI[i] =3D 0; - dm_fat_tbl->antRSSIcnt[i] =3D 0; } dm_fat_tbl->TrainIdx =3D 0; dm_fat_tbl->FAT_State =3D FAT_NORMAL_STATE; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index c77c5c1fbe7f..908cc425c973 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -413,7 +413,6 @@ struct fast_ant_train { u8 antsel_rx_keep_1; u8 antsel_rx_keep_2; u32 antSumRSSI[7]; - u32 antRSSIcnt[7]; u8 FAT_State; u32 TrainIdx; u8 antsel_a[ODM_ASSOCIATE_ENTRY_NUM]; --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 DE411C433EF for ; Sat, 18 Dec 2021 12:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233111AbhLRME7 (ORCPT ); Sat, 18 Dec 2021 07:04:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233076AbhLRMEu (ORCPT ); Sat, 18 Dec 2021 07:04:50 -0500 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 AD9D2C061574 for ; Sat, 18 Dec 2021 04:04:50 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSE-0008I6-Iw; Sat, 18 Dec 2021 13:04:46 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 5/9] staging: r8188: antSumRSSI is set but not used Date: Sat, 18 Dec 2021 13:04:19 +0100 Message-Id: <20211218120423.29906-6-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" antSumRSSI in struct fast_ant_train is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 1 - drivers/staging/r8188eu/hal/odm_RTL8188E.c | 5 ++--- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 021df3c8519f..1fb2d9a16fea 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -257,7 +257,6 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct = *dm_odm, antsel_tr_mux =3D (pDM_FatTable->antsel_rx_keep_2 << 2) | (pDM_FatTable->antsel_rx_keep_1 << 1) | pDM_FatTable->antsel_rx_keep_0; - pDM_FatTable->antSumRSSI[antsel_tr_mux] +=3D pPhyInfo->RxPWDBAll; } } } else if ((dm_odm->AntDivType =3D=3D CG_TRX_HW_ANTDIV) || (dm_odm->AntDi= vType =3D=3D CGCS_RX_HW_ANTDIV)) { diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r= 8188eu/hal/odm_RTL8188E.c index 848e301efc66..e55bb91b54ed 100644 --- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c @@ -59,10 +59,9 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct= *dm_odm) u32 value32, i; struct fast_ant_train *dm_fat_tbl =3D &dm_odm->DM_FatTable; =20 - for (i =3D 0; i < 6; i++) { + for (i =3D 0; i < 6; i++) dm_fat_tbl->Bssid[i] =3D 0; - dm_fat_tbl->antSumRSSI[i] =3D 0; - } + dm_fat_tbl->TrainIdx =3D 0; dm_fat_tbl->FAT_State =3D FAT_NORMAL_STATE; =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 908cc425c973..3d12b03f2d58 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -412,7 +412,6 @@ struct fast_ant_train { u8 antsel_rx_keep_0; u8 antsel_rx_keep_1; u8 antsel_rx_keep_2; - u32 antSumRSSI[7]; u8 FAT_State; u32 TrainIdx; u8 antsel_a[ODM_ASSOCIATE_ENTRY_NUM]; --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 92557C433EF for ; Sat, 18 Dec 2021 12:05:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233172AbhLRMFC (ORCPT ); Sat, 18 Dec 2021 07:05:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233095AbhLRMEv (ORCPT ); Sat, 18 Dec 2021 07:04:51 -0500 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 6290EC061574 for ; Sat, 18 Dec 2021 04:04:51 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSF-0008I6-FM; Sat, 18 Dec 2021 13:04:47 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 6/9] staging: r8188: Bssid in struct fast_ant_train is set but not used Date: Sat, 18 Dec 2021 13:04:20 +0100 Message-Id: <20211218120423.29906-7-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" Bssid in struct fast_ant_train is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 5 +---- drivers/staging/r8188eu/include/odm.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r= 8188eu/hal/odm_RTL8188E.c index e55bb91b54ed..8af45c7535ea 100644 --- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c @@ -56,12 +56,9 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *d= m_odm) =20 static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm) { - u32 value32, i; + u32 value32; struct fast_ant_train *dm_fat_tbl =3D &dm_odm->DM_FatTable; =20 - for (i =3D 0; i < 6; i++) - dm_fat_tbl->Bssid[i] =3D 0; - dm_fat_tbl->TrainIdx =3D 0; dm_fat_tbl->FAT_State =3D FAT_NORMAL_STATE; =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 3d12b03f2d58..b28294527ca7 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -408,7 +408,6 @@ struct odm_rf_cal { /* ODM Dynamic common info value definition */ =20 struct fast_ant_train { - u8 Bssid[6]; u8 antsel_rx_keep_0; u8 antsel_rx_keep_1; u8 antsel_rx_keep_2; --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 CD1C6C433F5 for ; Sat, 18 Dec 2021 12:05:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233147AbhLRMFE (ORCPT ); Sat, 18 Dec 2021 07:05:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233113AbhLRMEx (ORCPT ); Sat, 18 Dec 2021 07:04:53 -0500 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 6FB50C061574 for ; Sat, 18 Dec 2021 04:04:52 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSG-0008I6-Bo; Sat, 18 Dec 2021 13:04:48 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 7/9] staging: r8188: remove unused odm capabilities Date: Sat, 18 Dec 2021 13:04:21 +0100 Message-Id: <20211218120423.29906-8-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" Remove odm capabilities which are either unused or set but never checked. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 2 -- drivers/staging/r8188eu/include/odm.h | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index f8d2c98b3e35..6a5a80bfe7e4 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -55,11 +55,9 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapt= er) =20 pdmpriv->InitODMFlag =3D ODM_BB_DIG | ODM_BB_RA_MASK | - ODM_BB_DYNAMIC_TXPWR | ODM_BB_FA_CNT | ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | - ODM_BB_PWR_SAVE | ODM_MAC_EDCA_TURBO | ODM_RF_CALIBRATION | ODM_RF_TX_PWR_TRACK; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index b28294527ca7..8ab173f7c6c6 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -241,26 +241,19 @@ enum odm_common_info_def { enum odm_ability_def { /* BB ODM section BIT 0-15 */ ODM_BB_DIG =3D BIT(0), + ODM_BB_RA_MASK =3D BIT(1), - ODM_BB_DYNAMIC_TXPWR =3D BIT(2), ODM_BB_FA_CNT =3D BIT(3), ODM_BB_RSSI_MONITOR =3D BIT(4), ODM_BB_CCK_PD =3D BIT(5), ODM_BB_ANT_DIV =3D BIT(6), - ODM_BB_PWR_SAVE =3D BIT(7), ODM_BB_PWR_TRA =3D BIT(8), - ODM_BB_RATE_ADAPTIVE =3D BIT(9), - ODM_BB_PATH_DIV =3D BIT(10), - ODM_BB_PSD =3D BIT(11), - ODM_BB_RXHP =3D BIT(12), =20 /* MAC DM section BIT 16-23 */ ODM_MAC_EDCA_TURBO =3D BIT(16), - ODM_MAC_EARLY_MODE =3D BIT(17), =20 /* RF ODM section BIT 24-31 */ ODM_RF_TX_PWR_TRACK =3D BIT(24), - ODM_RF_RX_GAIN_TRACK =3D BIT(25), ODM_RF_CALIBRATION =3D BIT(26), }; =20 --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 A80D2C433FE for ; Sat, 18 Dec 2021 12:05:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233166AbhLRMFG (ORCPT ); Sat, 18 Dec 2021 07:05:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233068AbhLRMEz (ORCPT ); Sat, 18 Dec 2021 07:04:55 -0500 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 ACA4EC061401 for ; Sat, 18 Dec 2021 04:04:54 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSH-0008I6-8Q; Sat, 18 Dec 2021 13:04:49 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 8/9] staging: r8188: ODM_BB_DIG is always set Date: Sat, 18 Dec 2021 13:04:22 +0100 Message-Id: <20211218120423.29906-9-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" Remove the ODM_BB_DIG capability. It is always set for this driver. (ODM_BB_DIG was set in Update_ODM_ComInfo_88E and checked in odm_DIG, which was always called after the capability was set.) Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 3 +-- drivers/staging/r8188eu/include/odm.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 8d126a3a287b..70c83465a0a6 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -349,7 +349,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) u8 dm_dig_max, dm_dig_min; u8 CurrentIGI =3D pDM_DigTable->CurIGValue; =20 - if ((!(pDM_Odm->SupportAbility & ODM_BB_DIG)) || (!(pDM_Odm->SupportAbili= ty & ODM_BB_FA_CNT))) + if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) return; =20 if (*pDM_Odm->pbScanInProcess) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 6a5a80bfe7e4..865e520a246d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -53,8 +53,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) struct dm_priv *pdmpriv =3D &hal_data->dmpriv; int i; =20 - pdmpriv->InitODMFlag =3D ODM_BB_DIG | - ODM_BB_RA_MASK | + pdmpriv->InitODMFlag =3D ODM_BB_RA_MASK | ODM_BB_FA_CNT | ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 8ab173f7c6c6..6199190e5426 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -240,8 +240,6 @@ enum odm_common_info_def { =20 enum odm_ability_def { /* BB ODM section BIT 0-15 */ - ODM_BB_DIG =3D BIT(0), - ODM_BB_RA_MASK =3D BIT(1), ODM_BB_FA_CNT =3D BIT(3), ODM_BB_RSSI_MONITOR =3D BIT(4), --=20 2.20.1 From nobody Wed Jul 1 16:36:18 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 313E1C433FE for ; Sat, 18 Dec 2021 12:05:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233173AbhLRMFJ (ORCPT ); Sat, 18 Dec 2021 07:05:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233061AbhLRMEy (ORCPT ); Sat, 18 Dec 2021 07:04:54 -0500 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 D9245C06173E for ; Sat, 18 Dec 2021 04:04:53 -0800 (PST) Received: from dslb-178-004-169-039.178.004.pools.vodafone-ip.de ([178.4.169.39] 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 1myYSI-0008I6-6T; Sat, 18 Dec 2021 13:04:50 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 9/9] staging: r8188: ODM_BB_RA_MASK is always set Date: Sat, 18 Dec 2021 13:04:23 +0100 Message-Id: <20211218120423.29906-10-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211218120423.29906-1-martin@kaiser.cx> References: <20211218120423.29906-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" Remove the ODM_BB_RA_MASK capability. It is always set for this driver. Like for ODM_BB_DIG before, we can be sure that ODM_BB_RA_MASK was never checked before it was set. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 3 +-- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 70c83465a0a6..7a42687b3128 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -725,9 +725,6 @@ void odm_RefreshRateAdaptiveMask(struct odm_dm_struct *= pDM_Odm) u8 i; struct adapter *pAdapter =3D pDM_Odm->Adapter; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_RA_MASK)) - return; - if (pAdapter->bDriverStopped) return; =20 diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 865e520a246d..685431034495 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -53,8 +53,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) struct dm_priv *pdmpriv =3D &hal_data->dmpriv; int i; =20 - pdmpriv->InitODMFlag =3D ODM_BB_RA_MASK | - ODM_BB_FA_CNT | + pdmpriv->InitODMFlag =3D ODM_BB_FA_CNT | ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | ODM_MAC_EDCA_TURBO | diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 6199190e5426..19e859b989ad 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -240,7 +240,6 @@ enum odm_common_info_def { =20 enum odm_ability_def { /* BB ODM section BIT 0-15 */ - ODM_BB_RA_MASK =3D BIT(1), ODM_BB_FA_CNT =3D BIT(3), ODM_BB_RSSI_MONITOR =3D BIT(4), ODM_BB_CCK_PD =3D BIT(5), --=20 2.20.1