From nobody Fri Dec 19 20:11:59 2025 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 54A8DC4332F for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234255AbiAHMuX (ORCPT ); Sat, 8 Jan 2022 07:50:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231793AbiAHMuS (ORCPT ); Sat, 8 Jan 2022 07:50:18 -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 2D1E8C06173F for ; Sat, 8 Jan 2022 04:50:17 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAi-0005EJ-Ec; Sat, 08 Jan 2022 13:50:12 +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 01/12] staging: r8188eu: ODM_MAC_EDCA_TURBO is always set Date: Sat, 8 Jan 2022 13:49:48 +0100 Message-Id: <20220108124959.313215-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 ODM_MAC_EDCA_TURBO flag is always set for chips that are supported by this driver. Remove the flag and the one place where it's checked. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 1 - drivers/staging/r8188eu/include/odm.h | 3 --- 3 files changed, 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index d8fa587ff286..77ece1950b63 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -563,9 +563,6 @@ static void odm_EdcaTurboCheck(struct odm_dm_struct *pD= M_Odm) struct mlme_ext_priv *pmlmeext =3D &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 - if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO)) - return; - if (pregpriv->wifi_spec =3D=3D 1) goto dm_CheckEdcaTurbo_EXIT; =20 diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index bd6eb3878060..5118d0e3045b 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -56,7 +56,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) pdmpriv->InitODMFlag =3D ODM_BB_FA_CNT | ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | - ODM_MAC_EDCA_TURBO | ODM_RF_CALIBRATION | ODM_RF_TX_PWR_TRACK; if (hal_data->AntDivCfg) diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 23a151c558dc..616a862180b2 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -154,9 +154,6 @@ enum odm_ability_def { ODM_BB_ANT_DIV =3D BIT(6), ODM_BB_PWR_TRA =3D BIT(8), =20 - /* MAC DM section BIT 16-23 */ - ODM_MAC_EDCA_TURBO =3D BIT(16), - /* RF ODM section BIT 24-31 */ ODM_RF_TX_PWR_TRACK =3D BIT(24), ODM_RF_CALIBRATION =3D BIT(26), --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 12266C433FE for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234230AbiAHMuV (ORCPT ); Sat, 8 Jan 2022 07:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbiAHMuS (ORCPT ); Sat, 8 Jan 2022 07:50:18 -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 26422C06173E for ; Sat, 8 Jan 2022 04:50:17 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAj-0005EJ-E8; Sat, 08 Jan 2022 13:50:13 +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 02/12] staging: r8188eu: ODM_BB_FA_CNT is always set Date: Sat, 8 Jan 2022 13:49:49 +0100 Message-Id: <20220108124959.313215-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 ODM_BB_FA_CNT flag is always set. Remove the flag and the code to check if ODM_BB_FA_CNT is not set. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 8 +------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 3 +-- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 77ece1950b63..7cc9ab4b1a59 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -169,9 +169,6 @@ static 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_FA_CNT)) - return; - if (*pDM_Odm->pbScanInProcess) return; =20 @@ -367,9 +364,6 @@ static void odm_FalseAlarmCounterStatistics(struct odm_= dm_struct *pDM_Odm) struct false_alarm_stats *FalseAlmCnt =3D &pDM_Odm->FalseAlmCnt; struct adapter *adapter =3D pDM_Odm->Adapter; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) - return; - /* hold ofdm counter */ rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); /*= hold page C counter */ rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_RSTD_11N, BIT(31), 1); /* = hold page D counter */ @@ -422,7 +416,7 @@ static void odm_CCKPacketDetectionThresh(struct odm_dm_= struct *pDM_Odm) u8 CurCCK_CCAThres; struct false_alarm_stats *FalseAlmCnt =3D &pDM_Odm->FalseAlmCnt; =20 - if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD | ODM_BB_FA_CNT))) + if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD)) return; if (pDM_Odm->bLinked) { if (pDM_Odm->RSSI_Min > 25) { diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 5118d0e3045b..2ff9c7d84dbf 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_FA_CNT | - ODM_BB_RSSI_MONITOR | + pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | 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 616a862180b2..664e75c3a7c2 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -148,7 +148,6 @@ enum odm_common_info_def { =20 enum odm_ability_def { /* BB ODM section BIT 0-15 */ - 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), --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 30E81C433F5 for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234240AbiAHMuW (ORCPT ); Sat, 8 Jan 2022 07:50:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231812AbiAHMuS (ORCPT ); Sat, 8 Jan 2022 07:50:18 -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 38DC8C061401 for ; Sat, 8 Jan 2022 04:50:18 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAk-0005EJ-Ay; Sat, 08 Jan 2022 13:50:14 +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 03/12] staging: r8188eu: ODM_BB_CCK_PD is always set Date: Sat, 8 Jan 2022 13:49:50 +0100 Message-Id: <20220108124959.313215-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 ODM_BB_CCK_PD flag is always set. Remove the flag and the check if ODM_BB_CCK_PD is not set. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 2 -- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 7cc9ab4b1a59..8156e4acaa09 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -416,8 +416,6 @@ static void odm_CCKPacketDetectionThresh(struct odm_dm_= struct *pDM_Odm) u8 CurCCK_CCAThres; struct false_alarm_stats *FalseAlmCnt =3D &pDM_Odm->FalseAlmCnt; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD)) - return; if (pDM_Odm->bLinked) { if (pDM_Odm->RSSI_Min > 25) { CurCCK_CCAThres =3D 0xcd; diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 2ff9c7d84dbf..adf87c1721ee 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -54,7 +54,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) int i; =20 pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | - ODM_BB_CCK_PD | ODM_RF_CALIBRATION | ODM_RF_TX_PWR_TRACK; if (hal_data->AntDivCfg) diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 664e75c3a7c2..50960e7daf1d 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -149,7 +149,6 @@ enum odm_common_info_def { enum odm_ability_def { /* BB ODM section BIT 0-15 */ ODM_BB_RSSI_MONITOR =3D BIT(4), - ODM_BB_CCK_PD =3D BIT(5), ODM_BB_ANT_DIV =3D BIT(6), ODM_BB_PWR_TRA =3D BIT(8), =20 --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 7B5C8C43217 for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234267AbiAHMuZ (ORCPT ); Sat, 8 Jan 2022 07:50:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234193AbiAHMuU (ORCPT ); Sat, 8 Jan 2022 07:50:20 -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 8BECCC061574 for ; Sat, 8 Jan 2022 04:50:19 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAl-0005EJ-6c; Sat, 08 Jan 2022 13:50:15 +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 04/12] staging: r8188eu: remove unused chip type settings Date: Sat, 8 Jan 2022 13:49:51 +0100 Message-Id: <20220108124959.313215-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 some unused defines and macros related to chip type. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/HalVerDef.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/= r8188eu/include/HalVerDef.h index 62b94c993f0d..f4816ac765e5 100644 --- a/drivers/staging/r8188eu/include/HalVerDef.h +++ b/drivers/staging/r8188eu/include/HalVerDef.h @@ -6,7 +6,6 @@ enum HAL_CHIP_TYPE { TEST_CHIP =3D 0, NORMAL_CHIP =3D 1, - FPGA =3D 2, }; =20 enum HAL_CUT_VERSION { @@ -40,8 +39,6 @@ struct HAL_VERSION { /* HAL_VERSION VersionID */ =20 /* HAL_CHIP_TYPE_E */ -#define IS_TEST_CHIP(version) \ - ((GET_CVID_CHIP_TYPE(version) =3D=3D TEST_CHIP) ? true : false) #define IS_NORMAL_CHIP(version) \ ((GET_CVID_CHIP_TYPE(version) =3D=3D NORMAL_CHIP) ? true : false) =20 @@ -60,7 +57,5 @@ struct HAL_VERSION { /* HAL_VENDOR_E */ #define IS_CHIP_VENDOR_TSMC(version) \ ((GET_CVID_MANUFACTUER(version) =3D=3D CHIP_VENDOR_TSMC) ? true : false) -#define IS_CHIP_VENDOR_UMC(version) \ - ((GET_CVID_MANUFACTUER(version) =3D=3D CHIP_VENDOR_UMC) ? true : false) =20 #endif --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 90B56C43219 for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234269AbiAHMu2 (ORCPT ); Sat, 8 Jan 2022 07:50:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234223AbiAHMuU (ORCPT ); Sat, 8 Jan 2022 07:50:20 -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 61443C061574 for ; Sat, 8 Jan 2022 04:50:20 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAm-0005EJ-1l; Sat, 08 Jan 2022 13:50:16 +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 05/12] staging: r8188eu: remove obsolete defines and comments Date: Sat, 8 Jan 2022 13:49:52 +0100 Message-Id: <20220108124959.313215-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 some unused phycfg defines and obsolete comments. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 302b15b2874d..c06a332f6b20 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -8,25 +8,6 @@ #include "../include/rtw_iol.h" #include "../include/rtl8188e_hal.h" =20 -/*---------------------------Define Local Constant------------------------= ---*/ -/* Channel switch:The size of command tables for switch channel*/ -#define MAX_PRECMD_CNT 16 -#define MAX_RFDEPENDCMD_CNT 16 -#define MAX_POSTCMD_CNT 16 - -#define MAX_DOZE_WAITING_TIMES_9x 64 - -/*---------------------------Define Local Constant------------------------= ---*/ - -/*------------------------Define global variable--------------------------= ---*/ - -/*------------------------Define local variable---------------------------= ---*/ - -/*--------------------Define export function prototype--------------------= ---*/ -/* Please refer to header file */ -/*--------------------Define export function prototype--------------------= ---*/ - -/*----------------------------Function Body-------------------------------= ---*/ /* */ /* 1. BB register R/W API */ /* */ --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 AABDFC4167B for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234293AbiAHMua (ORCPT ); Sat, 8 Jan 2022 07:50:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234226AbiAHMuV (ORCPT ); Sat, 8 Jan 2022 07:50:21 -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 DF52AC061574 for ; Sat, 8 Jan 2022 04:50:20 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAm-0005EJ-UC; Sat, 08 Jan 2022 13:50:16 +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 06/12] staging: r8188eu: CurrentBW4024GTxPwrIdx is set but not used Date: Sat, 8 Jan 2022 13:49:53 +0100 Message-Id: <20220108124959.313215-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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" CurrentBW4024GTxPwrIdx in struct hal_data_8188e is set but not used. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index c06a332f6b20..fe15b15ab951 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -589,7 +589,6 @@ static void phy_PowerIndexCheck88E(struct adapter *Adap= ter, u8 channel, u8 *cckP pHalData->CurrentCckTxPwrIdx =3D cckPowerLevel[0]; pHalData->CurrentOfdm24GTxPwrIdx =3D ofdmPowerLevel[0]; pHalData->CurrentBW2024GTxPwrIdx =3D BW20PowerLevel[0]; - pHalData->CurrentBW4024GTxPwrIdx =3D BW40PowerLevel[0]; } =20 /*------------------------------------------------------------------------= ----- diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 66eadd170c9b..1c52dd9d9721 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -180,7 +180,6 @@ struct hal_data_8188e { u8 CurrentCckTxPwrIdx; u8 CurrentOfdm24GTxPwrIdx; u8 CurrentBW2024GTxPwrIdx; - u8 CurrentBW4024GTxPwrIdx; =20 /* Read/write are allow for following hardware information variables */ u8 pwrGroupCnt; --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 CFCE9C4321E for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234328AbiAHMud (ORCPT ); Sat, 8 Jan 2022 07:50:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234232AbiAHMuV (ORCPT ); Sat, 8 Jan 2022 07:50:21 -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 9A297C061574 for ; Sat, 8 Jan 2022 04:50:21 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAn-0005EJ-Oh; Sat, 08 Jan 2022 13:50:17 +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 07/12] staging: r8188eu: CurrentBW2024GTxPwrIdx is set but not used Date: Sat, 8 Jan 2022 13:49:54 +0100 Message-Id: <20220108124959.313215-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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" CurrentBW2024GTxPwrIdx in struct hal_data_8188e is set but not used. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index fe15b15ab951..24b5604afbc9 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -588,7 +588,6 @@ static void phy_PowerIndexCheck88E(struct adapter *Adap= ter, u8 channel, u8 *cckP =20 pHalData->CurrentCckTxPwrIdx =3D cckPowerLevel[0]; pHalData->CurrentOfdm24GTxPwrIdx =3D ofdmPowerLevel[0]; - pHalData->CurrentBW2024GTxPwrIdx =3D BW20PowerLevel[0]; } =20 /*------------------------------------------------------------------------= ----- diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 1c52dd9d9721..0c7f5e078bed 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -179,7 +179,6 @@ struct hal_data_8188e { /* The current Tx Power Level */ u8 CurrentCckTxPwrIdx; u8 CurrentOfdm24GTxPwrIdx; - u8 CurrentBW2024GTxPwrIdx; =20 /* Read/write are allow for following hardware information variables */ u8 pwrGroupCnt; --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 E077EC433F5 for ; Sat, 8 Jan 2022 12:50:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234232AbiAHMuh (ORCPT ); Sat, 8 Jan 2022 07:50:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234244AbiAHMuX (ORCPT ); Sat, 8 Jan 2022 07:50:23 -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 18181C06173E for ; Sat, 8 Jan 2022 04:50:23 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAo-0005EJ-JG; Sat, 08 Jan 2022 13:50:18 +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 08/12] staging: r8188eu: CurrentOfdm24GTxPwrIdx is set but not used Date: Sat, 8 Jan 2022 13:49:55 +0100 Message-Id: <20220108124959.313215-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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" CurrentOfdm24GTxPwrIdx in struct hal_data_8188e is set but not used. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 24b5604afbc9..a80f40fccf09 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -587,7 +587,6 @@ static void phy_PowerIndexCheck88E(struct adapter *Adap= ter, u8 channel, u8 *cckP struct hal_data_8188e *pHalData =3D &Adapter->haldata; =20 pHalData->CurrentCckTxPwrIdx =3D cckPowerLevel[0]; - pHalData->CurrentOfdm24GTxPwrIdx =3D ofdmPowerLevel[0]; } =20 /*------------------------------------------------------------------------= ----- diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 0c7f5e078bed..fd2ee1739f88 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -178,7 +178,6 @@ struct hal_data_8188e { =20 /* The current Tx Power Level */ u8 CurrentCckTxPwrIdx; - u8 CurrentOfdm24GTxPwrIdx; =20 /* Read/write are allow for following hardware information variables */ u8 pwrGroupCnt; --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 E29E2C4167E for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234366AbiAHMue (ORCPT ); Sat, 8 Jan 2022 07:50:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234245AbiAHMuX (ORCPT ); Sat, 8 Jan 2022 07:50:23 -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 18091C061574 for ; Sat, 8 Jan 2022 04:50:23 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAp-0005EJ-Dv; Sat, 08 Jan 2022 13:50:19 +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 09/12] staging: r8188eu: CurrentCckTxPwrIdx is set but not used Date: Sat, 8 Jan 2022 13:49:56 +0100 Message-Id: <20220108124959.313215-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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" CurrentCckTxPwrIdx in struct hal_data_8188e is set but not used. It can be removed. The phy_PowerIndexCheck88E function is now empty. Remove it as well. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 10 ---------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 --- 2 files changed, 13 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index a80f40fccf09..c1639df8b1e7 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -581,14 +581,6 @@ static void getTxPowerIndex88E(struct adapter *Adapter= , u8 channel, u8 *cckPower BW40PowerLevel[RF_PATH_A] =3D pHalData->Index24G_BW40_Base[index]; } =20 -static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8= *cckPowerLevel, - u8 *ofdmPowerLevel, u8 *BW20PowerLevel, u8 *BW40PowerLevel) -{ - struct hal_data_8188e *pHalData =3D &Adapter->haldata; - - pHalData->CurrentCckTxPwrIdx =3D cckPowerLevel[0]; -} - /*------------------------------------------------------------------------= ----- * Function: SetTxPowerLevel8190() * @@ -619,8 +611,6 @@ PHY_SetTxPowerLevel8188E( =20 getTxPowerIndex88E(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLevel[0= ], &BW20PowerLevel[0], &BW40PowerLevel[0]); =20 - phy_PowerIndexCheck88E(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLev= el[0], &BW20PowerLevel[0], &BW40PowerLevel[0]); - rtl8188e_PHY_RF6052SetCckTxPower(Adapter, &cckPowerLevel[0]); rtl8188e_PHY_RF6052SetOFDMTxPower(Adapter, &ofdmPowerLevel[0], &BW20Power= Level[0], &BW40PowerLevel[0], channel); } diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index fd2ee1739f88..a24cdbfa83de 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -176,9 +176,6 @@ struct hal_data_8188e { u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; =20 - /* The current Tx Power Level */ - u8 CurrentCckTxPwrIdx; - /* Read/write are allow for following hardware information variables */ u8 pwrGroupCnt; u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP][16]; --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 31BF3C433EF for ; Sat, 8 Jan 2022 12:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234467AbiAHMul (ORCPT ); Sat, 8 Jan 2022 07:50:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234259AbiAHMuY (ORCPT ); Sat, 8 Jan 2022 07:50:24 -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 3EB06C061574 for ; Sat, 8 Jan 2022 04:50:24 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAq-0005EJ-7c; Sat, 08 Jan 2022 13:50:20 +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 10/12] staging: r8188eu: HW_VAR_MEDIA_STATUS1 is never set Date: Sat, 8 Jan 2022 13:49:57 +0100 Message-Id: <20220108124959.313215-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 HW_VAR_MEDIA_STATUS1 hal variable is never set. Remove its define and the code to set it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 9 --------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 2 files changed, 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 38b88e6b7bdb..21cb505036b7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1087,15 +1087,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtw_write8(Adapter, MSR, val8); } break; - case HW_VAR_MEDIA_STATUS1: - { - u8 val8; - - val8 =3D rtw_read8(Adapter, MSR) & 0x03; - val8 |=3D *((u8 *)val) << 2; - rtw_write8(Adapter, MSR, val8); - } - break; case HW_VAR_SET_OPMODE: hw_var_set_opmode(Adapter, variable, val); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 120b32994e1f..6728cb506303 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -10,7 +10,6 @@ =20 enum hw_variables { HW_VAR_MEDIA_STATUS, - HW_VAR_MEDIA_STATUS1, HW_VAR_SET_OPMODE, HW_VAR_MAC_ADDR, HW_VAR_BSSID, --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 F1F5DC433FE for ; Sat, 8 Jan 2022 12:50:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234432AbiAHMuj (ORCPT ); Sat, 8 Jan 2022 07:50:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234265AbiAHMuZ (ORCPT ); Sat, 8 Jan 2022 07:50:25 -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 07BF4C061574 for ; Sat, 8 Jan 2022 04:50:24 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAr-0005EJ-3S; Sat, 08 Jan 2022 13:50:21 +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 11/12] staging: r8188eu: remove HAL_*_ENABLE defines Date: Sat, 8 Jan 2022 13:49:58 +0100 Message-Id: <20220108124959.313215-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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" HAL_(MAC|BB|RF)_ENABLE are always set. Remove the defines and the checks where they are used. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 21cb505036b7..cc8f8c7d0734 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -13,10 +13,6 @@ #include "../include/usb_osintf.h" #include "../include/Hal8188EPwrSeq.h" =20 -#define HAL_MAC_ENABLE 1 -#define HAL_BB_ENABLE 1 -#define HAL_RF_ENABLE 1 - static void _ConfigNormalChipOutEP_8188E(struct adapter *adapt, u8 NumOutP= ipe) { struct hal_data_8188e *haldata =3D &adapt->haldata; @@ -640,32 +636,26 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) Adapter->pwrctrlpriv.bFwCurrentInPSMode =3D false; haldata->LastHMEBoxNum =3D 0; =20 -#if (HAL_MAC_ENABLE =3D=3D 1) status =3D PHY_MACConfig8188E(Adapter); if (status =3D=3D _FAIL) { DBG_88E(" ### Failed to init MAC ......\n "); goto exit; } -#endif =20 /* */ /* d. Initialize BB related configurations. */ /* */ -#if (HAL_BB_ENABLE =3D=3D 1) status =3D PHY_BBConfig8188E(Adapter); if (status =3D=3D _FAIL) { DBG_88E(" ### Failed to init BB ......\n "); goto exit; } -#endif =20 -#if (HAL_RF_ENABLE =3D=3D 1) status =3D PHY_RFConfig8188E(Adapter); if (status =3D=3D _FAIL) { DBG_88E(" ### Failed to init RF ......\n "); goto exit; } -#endif =20 status =3D rtl8188e_iol_efuse_patch(Adapter); if (status =3D=3D _FAIL) { --=20 2.30.2 From nobody Fri Dec 19 20:11:59 2025 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 3DFE5C433F5 for ; Sat, 8 Jan 2022 12:50:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234413AbiAHMuu (ORCPT ); Sat, 8 Jan 2022 07:50:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231812AbiAHMu1 (ORCPT ); Sat, 8 Jan 2022 07:50:27 -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 1834FC061574 for ; Sat, 8 Jan 2022 04:50:27 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAs-0005EJ-F3; Sat, 08 Jan 2022 13:50:22 +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 12/12] staging: r8188eu: we always enqueue in rtw_set_chplan_cmd Date: Sat, 8 Jan 2022 13:49:59 +0100 Message-Id: <20220108124959.313215-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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 only caller of rtw_set_chplan_cmd requests that the message be enqueued and not sent directly. Remove the enqueue parameter and the code for direct sending. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_cmd.c | 26 +++++++------------- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 712fd6e536c4..3d22a8888ea7 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -836,7 +836,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) return res; } =20 -u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) +u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan) { struct cmd_obj *pcmdobj; struct SetChannelPlan_param *setChannelPlan_param; @@ -859,25 +859,17 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 ch= plan, u8 enqueue) } setChannelPlan_param->channel_plan =3D chplan; =20 - if (enqueue) { - /* need enqueue, prepare cmd_obj and enqueue */ - pcmdobj =3D kzalloc(sizeof(struct cmd_obj), GFP_KERNEL); - if (!pcmdobj) { - kfree(setChannelPlan_param); - res =3D _FAIL; - goto exit; - } - - init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, GEN_CMD_CODE(_= SetChannelPlan)); - res =3D rtw_enqueue_cmd(pcmdpriv, pcmdobj); - } else { - /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ - if (H2C_SUCCESS !=3D set_chplan_hdl(padapter, (unsigned char *)setChanne= lPlan_param)) - res =3D _FAIL; - + /* need enqueue, prepare cmd_obj and enqueue */ + pcmdobj =3D kzalloc(sizeof(struct cmd_obj), GFP_KERNEL); + if (!pcmdobj) { kfree(setChannelPlan_param); + res =3D _FAIL; + goto exit; } =20 + init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, GEN_CMD_CODE(_S= etChannelPlan)); + res =3D rtw_enqueue_cmd(pcmdpriv, pcmdobj); + /* do something based on res... */ if (res =3D=3D _SUCCESS) padapter->mlmepriv.ChannelPlan =3D chplan; diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index cf0945ae11c1..60cecdd4ee0e 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -772,7 +772,7 @@ u8 rtw_ps_cmd(struct adapter*padapter); =20 u8 rtw_chk_hi_queue_cmd(struct adapter*padapter); =20 -u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue); +u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan); =20 u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); =20 diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index 41b457838a5b..b9f9698d70cf 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -2098,7 +2098,7 @@ static int rtw_wx_set_channel_plan(struct net_device = *dev, struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; u8 channel_plan_req =3D (u8)(*((int *)wrqu)); =20 - if (_SUCCESS =3D=3D rtw_set_chplan_cmd(padapter, channel_plan_req, 1)) + if (_SUCCESS =3D=3D rtw_set_chplan_cmd(padapter, channel_plan_req)) DBG_88E("%s set channel_plan =3D 0x%02X\n", __func__, pmlmepriv->Channel= Plan); else return -EPERM; --=20 2.30.2