From nobody Mon Jun 29 16:47:11 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 BE643C433EF for ; Sun, 6 Feb 2022 16:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244605AbiBFQSZ (ORCPT ); Sun, 6 Feb 2022 11:18:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235848AbiBFQSY (ORCPT ); Sun, 6 Feb 2022 11:18: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 78E9BC043184 for ; Sun, 6 Feb 2022 08:18:21 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkEz-0001bS-U3; Sun, 06 Feb 2022 17:18: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 01/14] staging: r8188eu: only OFDM_index_old[0] is used Date: Sun, 6 Feb 2022 17:17:56 +0100 Message-Id: <20220206161809.423031-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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_TXPowerTrackingCallback_ThermalMeter_8188E function uses only OFDM_index_old[0]. Use a single variable instead of an array. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 5df8371a44fb..08db24614ed1 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -104,7 +104,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( u32 ThermalValue_AVG =3D 0; s32 ele_D, TempCCk; s8 OFDM_index[2], CCK_index =3D 0; - s8 OFDM_index_old[2] =3D {0, 0}, CCK_index_old =3D 0; + s8 OFDM_index_old =3D 0, CCK_index_old =3D 0; u32 i =3D 0, j =3D 0; =20 u8 OFDM_min_index =3D 6; /* OFDM BB Swing should be less than +3.0dB, whi= ch is required by Arthur */ @@ -139,7 +139,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( ele_D =3D rtl8188e_PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance, bMask= DWord) & bMaskOFDM_D; for (i =3D 0; i < OFDM_TABLE_SIZE_92D; i++) { /* find the index */ if (ele_D =3D=3D (OFDMSwingTable[i] & bMaskOFDM_D)) { - OFDM_index_old[0] =3D (u8)i; + OFDM_index_old =3D (u8)i; dm_odm->BbSwingIdxOfdmBase =3D (u8)i; break; } @@ -169,7 +169,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( dm_odm->RFCalibrateInfo.ThermalValue_LCK =3D ThermalValue; dm_odm->RFCalibrateInfo.ThermalValue_IQK =3D ThermalValue; =20 - dm_odm->RFCalibrateInfo.OFDM_index[0] =3D OFDM_index_old[0]; + dm_odm->RFCalibrateInfo.OFDM_index[0] =3D OFDM_index_old; dm_odm->RFCalibrateInfo.CCK_index =3D CCK_index_old; } =20 --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 D54D1C433F5 for ; Sun, 6 Feb 2022 16:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244743AbiBFQSb (ORCPT ); Sun, 6 Feb 2022 11:18:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239973AbiBFQSY (ORCPT ); Sun, 6 Feb 2022 11:18: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 23C1BC043185 for ; Sun, 6 Feb 2022 08:18:23 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF0-0001bS-TB; Sun, 06 Feb 2022 17:18: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 02/14] staging: r8188eu: only OFDM_index[0] is used Date: Sun, 6 Feb 2022 17:17:57 +0100 Message-Id: <20220206161809.423031-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" Replace the OFDM_index array in struct odm_rf_cal with a single variable. Only its first component is used. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 4 ++-- drivers/staging/r8188eu/include/odm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 08db24614ed1..8b3bc41b7e27 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -169,7 +169,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( dm_odm->RFCalibrateInfo.ThermalValue_LCK =3D ThermalValue; dm_odm->RFCalibrateInfo.ThermalValue_IQK =3D ThermalValue; =20 - dm_odm->RFCalibrateInfo.OFDM_index[0] =3D OFDM_index_old; + dm_odm->RFCalibrateInfo.OFDM_index =3D OFDM_index_old; dm_odm->RFCalibrateInfo.CCK_index =3D CCK_index_old; } =20 @@ -234,7 +234,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( } if (offset >=3D index_mapping_NUM_88E) offset =3D index_mapping_NUM_88E - 1; - OFDM_index[0] =3D dm_odm->RFCalibrateInfo.OFDM_index[0] + OFDM_index_ma= pping[j][offset]; + OFDM_index[0] =3D dm_odm->RFCalibrateInfo.OFDM_index + OFDM_index_mappi= ng[j][offset]; CCK_index =3D dm_odm->RFCalibrateInfo.CCK_index + OFDM_index_mapping[j]= [offset]; =20 if (OFDM_index[0] > OFDM_TABLE_SIZE_92D - 1) diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index f7f85ca05bd3..698d61d5fc40 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -254,7 +254,7 @@ struct odm_rf_cal { =20 u8 bCCKinCH14; u8 CCK_index; - u8 OFDM_index[2]; + u8 OFDM_index; bool bDoneTxpower; =20 u8 ThermalValue_HP[HP_THERMAL_NUM]; --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 C40C2C433EF for ; Sun, 6 Feb 2022 16:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244793AbiBFQSe (ORCPT ); Sun, 6 Feb 2022 11:18:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242793AbiBFQSY (ORCPT ); Sun, 6 Feb 2022 11:18: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 40059C043186 for ; Sun, 6 Feb 2022 08:18:23 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF1-0001bS-MF; Sun, 06 Feb 2022 17:18: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 03/14] staging: r8188eu: replace local OFDM_index with single variable Date: Sun, 6 Feb 2022 17:17:58 +0100 Message-Id: <20220206161809.423031-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" Replace the local OFDM_index array in the odm_TXPowerTrackingCallback_ThermalMeter_8188E function with a single variable. Only its first component is used. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 8b3bc41b7e27..27cac9775a90 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -103,7 +103,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( u8 ThermalValue_AVG_count =3D 0; u32 ThermalValue_AVG =3D 0; s32 ele_D, TempCCk; - s8 OFDM_index[2], CCK_index =3D 0; + s8 OFDM_index, CCK_index =3D 0; s8 OFDM_index_old =3D 0, CCK_index_old =3D 0; u32 i =3D 0, j =3D 0; =20 @@ -234,13 +234,13 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( } if (offset >=3D index_mapping_NUM_88E) offset =3D index_mapping_NUM_88E - 1; - OFDM_index[0] =3D dm_odm->RFCalibrateInfo.OFDM_index + OFDM_index_mappi= ng[j][offset]; + OFDM_index =3D dm_odm->RFCalibrateInfo.OFDM_index + OFDM_index_mapping[= j][offset]; CCK_index =3D dm_odm->RFCalibrateInfo.CCK_index + OFDM_index_mapping[j]= [offset]; =20 - if (OFDM_index[0] > OFDM_TABLE_SIZE_92D - 1) - OFDM_index[0] =3D OFDM_TABLE_SIZE_92D - 1; - else if (OFDM_index[0] < OFDM_min_index) - OFDM_index[0] =3D OFDM_min_index; + if (OFDM_index > OFDM_TABLE_SIZE_92D - 1) + OFDM_index =3D OFDM_TABLE_SIZE_92D - 1; + else if (OFDM_index < OFDM_min_index) + OFDM_index =3D OFDM_min_index; =20 if (CCK_index > CCK_TABLE_SIZE - 1) CCK_index =3D CCK_TABLE_SIZE - 1; @@ -253,7 +253,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( dm_odm->RFCalibrateInfo.bDoneTxpower =3D true; =20 /* Revse TX power table. */ - dm_odm->BbSwingIdxOfdm =3D (u8)OFDM_index[0]; + dm_odm->BbSwingIdxOfdm =3D (u8)OFDM_index; dm_odm->BbSwingIdxCck =3D (u8)CCK_index; =20 if (dm_odm->BbSwingIdxOfdmCurrent !=3D dm_odm->BbSwingIdxOfdm) { --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 E474BC433FE for ; Sun, 6 Feb 2022 16:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244913AbiBFQSh (ORCPT ); Sun, 6 Feb 2022 11:18:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244557AbiBFQSZ (ORCPT ); Sun, 6 Feb 2022 11:18: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 6F45FC06173B for ; Sun, 6 Feb 2022 08:18:24 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF2-0001bS-Fm; Sun, 06 Feb 2022 17:18: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 04/14] staging: r8188eu: remove debug code to bypass LC calibration Date: Sun, 6 Feb 2022 17:17:59 +0100 Message-Id: <20220206161809.423031-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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 a check before the LC calibration that is always false. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 27cac9775a90..0c2dbef59197 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -895,15 +895,10 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, boo= l recovery) =20 void PHY_LCCalibrate_8188E(struct adapter *adapt) { - bool singletone =3D false, carrier_sup =3D false; u32 timeout =3D 2000, timecount =3D 0; struct hal_data_8188e *pHalData =3D &adapt->haldata; struct odm_dm_struct *dm_odm =3D &pHalData->odmpriv; =20 - /* 20120213 Turn on when continuous Tx to pass lab testing. (req= uired by Edlu) */ - if (singletone || carrier_sup) - return; - while (*dm_odm->pbScanInProcess && timecount < timeout) { mdelay(50); timecount +=3D 50; --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 AD2C3C433F5 for ; Sun, 6 Feb 2022 16:18:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244767AbiBFQSk (ORCPT ); Sun, 6 Feb 2022 11:18:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244510AbiBFQSZ (ORCPT ); Sun, 6 Feb 2022 11:18: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 C267DC043184 for ; Sun, 6 Feb 2022 08:18:24 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF3-0001bS-7i; Sun, 06 Feb 2022 17:18: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 05/14] staging: r8188eu: remove debug code to bypass IQ calibration Date: Sun, 6 Feb 2022 17:18:00 +0100 Message-Id: <20220206161809.423031-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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 a check before the IQ calibration that is always false. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 0c2dbef59197..8edae488d998 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -795,7 +795,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool = recovery) bool pathaok; s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC; bool is12simular, is13simular, is23simular; - bool singletone =3D false, carrier_sup =3D false; u32 IQK_BB_REG_92C[IQK_BB_REG_NUM] =3D { rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance, rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable, @@ -803,10 +802,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool= recovery) rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta}; =20 - /* 20120213 Turn on when continuous Tx to pass lab testing. (req= uired by Edlu) */ - if (singletone || carrier_sup) - return; - if (recovery) { reload_adda_reg(adapt, IQK_BB_REG_92C, dm_odm->RFCalibrateInfo.IQK_BB_ba= ckup_recover, 9); return; --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 D1954C433EF for ; Sun, 6 Feb 2022 16:18:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245258AbiBFQSs (ORCPT ); Sun, 6 Feb 2022 11:18:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244634AbiBFQS0 (ORCPT ); Sun, 6 Feb 2022 11:18:26 -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 21AF3C06173B for ; Sun, 6 Feb 2022 08:18:26 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF4-0001bS-12; Sun, 06 Feb 2022 17:18: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 06/14] staging: r8188eu: move local definitions into rtw_fw.h Date: Sun, 6 Feb 2022 17:18:01 +0100 Message-Id: <20220206161809.423031-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" Move some defines and the definition of struct rt_firmware_hdr from rtw_fw.h to rtw_fw.c. These definitions are used only by the fw layer. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_fw.c | 45 ++++++++++++++++++++++++ drivers/staging/r8188eu/include/rtw_fw.h | 45 ------------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index fa29d47bf165..f591b091b8af 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -4,6 +4,51 @@ #include #include "../include/rtw_fw.h" =20 +#define MAX_REG_BOLCK_SIZE 196 +#define FW_8188E_START_ADDRESS 0x1000 +#define MAX_PAGE_SIZE 4096 + +#define IS_FW_HEADER_EXIST(_fwhdr) \ + ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x92C0 || \ + (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88C0 || \ + (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ + (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) + +/* This structure must be careful with byte-ordering */ + +struct rt_firmware_hdr { + /* 8-byte alinment required */ + /* LONG WORD 0 ---- */ + __le16 Signature; /* 92C0: test chip; 92C, + * 88C0: test chip; 88C1: MP A-cut; + * 92C1: MP A-cut */ + u8 Category; /* AP/NIC and USB/PCI */ + u8 Function; /* Reserved for different FW function + * indcation, for further use when + * driver needs to download different + * FW for different conditions */ + __le16 Version; /* FW Version */ + u8 Subversion; /* FW Subversion, default 0x00 */ + u16 Rsvd1; + + /* LONG WORD 1 ---- */ + u8 Month; /* Release time Month field */ + u8 Date; /* Release time Date field */ + u8 Hour; /* Release time Hour field */ + u8 Minute; /* Release time Minute field */ + __le16 RamCodeSize; /* The size of RAM code */ + u8 Foundry; + u8 Rsvd2; + + /* LONG WORD 2 ---- */ + __le32 SvnIdx; /* The SVN entry index */ + u32 Rsvd3; + + /* LONG WORD 3 ---- */ + u32 Rsvd4; + u32 Rsvd5; +}; + static void fw_download_enable(struct adapter *padapter, bool enable) { u8 tmp; diff --git a/drivers/staging/r8188eu/include/rtw_fw.h b/drivers/staging/r81= 88eu/include/rtw_fw.h index 2ee9ae70a468..c4b1a8370b4a 100644 --- a/drivers/staging/r8188eu/include/rtw_fw.h +++ b/drivers/staging/r8188eu/include/rtw_fw.h @@ -6,51 +6,6 @@ =20 #include "drv_types.h" =20 -#define MAX_REG_BOLCK_SIZE 196 -#define FW_8188E_START_ADDRESS 0x1000 -#define MAX_PAGE_SIZE 4096 - -#define IS_FW_HEADER_EXIST(_fwhdr) \ - ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x92C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) - -/* This structure must be careful with byte-ordering */ - -struct rt_firmware_hdr { - /* 8-byte alinment required */ - /* LONG WORD 0 ---- */ - __le16 Signature; /* 92C0: test chip; 92C, - * 88C0: test chip; 88C1: MP A-cut; - * 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function - * indcation, for further use when - * driver needs to download different - * FW for different conditions */ - __le16 Version; /* FW Version */ - u8 Subversion; /* FW Subversion, default 0x00 */ - u16 Rsvd1; - - /* LONG WORD 1 ---- */ - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ - u8 Foundry; - u8 Rsvd2; - - /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ - u32 Rsvd3; - - /* LONG WORD 3 ---- */ - u32 Rsvd4; - u32 Rsvd5; -}; - int rtl8188e_firmware_download(struct adapter *padapter); void rtw_reset_8051(struct adapter *padapter); =20 --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 BBD09C433FE for ; Sun, 6 Feb 2022 16:18:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244837AbiBFQSn (ORCPT ); Sun, 6 Feb 2022 11:18:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244659AbiBFQS0 (ORCPT ); Sun, 6 Feb 2022 11:18:26 -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 586CCC043184 for ; Sun, 6 Feb 2022 08:18:26 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF4-0001bS-Qo; Sun, 06 Feb 2022 17:18: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 07/14] staging: r8188eu: remove unused enum _IFACE_TYPE Date: Sun, 6 Feb 2022 17:18:02 +0100 Message-Id: <20220206161809.423031-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" enum _IFACE_TYPE is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 388822dd325d..91e25a2b5947 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -159,12 +159,6 @@ static inline struct device *dvobj_to_dev(struct dvobj= _priv *dvobj) return &dvobj->pusbintf->dev; }; =20 -enum _IFACE_TYPE { - IFACE_PORT0, /* mapping to port0 for C/D series chips */ - IFACE_PORT1, /* mapping to port1 for C/D series chip */ - MAX_IFACE_PORT, -}; - enum _ADAPTER_TYPE { PRIMARY_ADAPTER, SECONDARY_ADAPTER, --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 C736AC433EF for ; Sun, 6 Feb 2022 16:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245036AbiBFQSq (ORCPT ); Sun, 6 Feb 2022 11:18:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244685AbiBFQS2 (ORCPT ); Sun, 6 Feb 2022 11:18:28 -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 650D1C043185 for ; Sun, 6 Feb 2022 08:18:27 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF5-0001bS-Ko; Sun, 06 Feb 2022 17:18:23 +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/14] staging: r8188eu: remove unused enum _ADAPTER_TYPE Date: Sun, 6 Feb 2022 17:18:03 +0100 Message-Id: <20220206161809.423031-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" enum _ADAPTER_TYPE is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 91e25a2b5947..a07bcf0b6358 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -159,12 +159,6 @@ static inline struct device *dvobj_to_dev(struct dvobj= _priv *dvobj) return &dvobj->pusbintf->dev; }; =20 -enum _ADAPTER_TYPE { - PRIMARY_ADAPTER, - SECONDARY_ADAPTER, - MAX_ADAPTER, -}; - enum driver_state { DRIVER_NORMAL =3D 0, DRIVER_DISAPPEAR =3D 1, --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 6FDF8C433EF for ; Sun, 6 Feb 2022 16:18:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343650AbiBFQSw (ORCPT ); Sun, 6 Feb 2022 11:18:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244706AbiBFQS3 (ORCPT ); Sun, 6 Feb 2022 11:18:29 -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 52ACDC043187 for ; Sun, 6 Feb 2022 08:18:28 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF6-0001bS-D9; Sun, 06 Feb 2022 17:18:24 +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/14] staging: r8188eu: remove the global DriverState Date: Sun, 6 Feb 2022 17:18:04 +0100 Message-Id: <20220206161809.423031-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" DriverState in struct adapter is never set. It remains 0 (DRIVER_NORMAL) all the time, DriverState !=3D DRIVER_DISAPPEAR is always true. Both DriverState and the check can be removed. enum driver_state contains the possible values of DriverState. This enum can be removed as well. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 8 -------- drivers/staging/r8188eu/os_dep/usb_intf.c | 8 +++----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index a07bcf0b6358..1260cacbae64 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -159,15 +159,7 @@ static inline struct device *dvobj_to_dev(struct dvobj= _priv *dvobj) return &dvobj->pusbintf->dev; }; =20 -enum driver_state { - DRIVER_NORMAL =3D 0, - DRIVER_DISAPPEAR =3D 1, - DRIVER_REPLACE_DONGLE =3D 2, -}; - struct adapter { - int DriverState;/* for disable driver using module, use dongle toi - * replace module. */ int pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */ int bDongle;/* build-in module or external dongle */ =20 diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 1a67486ff5fb..b20d0eca12fa 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -454,11 +454,9 @@ static void rtw_usb_if1_deinit(struct adapter *if1) =20 free_mlme_ap_info(if1); =20 - if (if1->DriverState !=3D DRIVER_DISAPPEAR) { - if (pnetdev) { - /* will call netdev_close() */ - unregister_netdev(pnetdev); - } + if (pnetdev) { + /* will call netdev_close() */ + unregister_netdev(pnetdev); } rtw_cancel_all_timer(if1); =20 --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 0E816C433EF for ; Sun, 6 Feb 2022 16:19:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244903AbiBFQS7 (ORCPT ); Sun, 6 Feb 2022 11:18:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244713AbiBFQS3 (ORCPT ); Sun, 6 Feb 2022 11:18:29 -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 DF399C043184 for ; Sun, 6 Feb 2022 08:18:28 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF7-0001bS-5x; Sun, 06 Feb 2022 17:18:25 +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/14] staging: r8188eu: remove unused struct adapter components Date: Sun, 6 Feb 2022 17:18:05 +0100 Message-Id: <20220206161809.423031-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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 a number of unused components from struct adapter. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 1260cacbae64..4553cfda0aa4 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -161,7 +161,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_= priv *dvobj) =20 struct adapter { int pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */ - int bDongle;/* build-in module or external dongle */ =20 struct dvobj_priv *dvobj; struct mlme_priv mlmepriv; @@ -186,20 +185,11 @@ struct adapter { s32 bSurpriseRemoved; s32 bCardDisableWOHSM; =20 - u32 IsrContent; - u32 ImrContent; - u8 EepromAddressSize; u8 hw_init_completed; - u8 bDriverIsGoingToUnload; - u8 init_adpt_in_progress; - u8 bHaltInProgress; s8 signal_strength; =20 void *cmdThread; - void *evtThread; - void *xmitThread; - void *recvThread; void (*intf_start)(struct adapter *adapter); void (*intf_stop)(struct adapter *adapter); struct net_device *pnetdev; @@ -219,7 +209,6 @@ struct adapter { =20 int net_closed; u8 bFWReady; - u8 bBTFWReady; u8 bReadPortCancel; u8 bWritePortCancel; u8 bRxRSSIDisplay; --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 378D2C433F5 for ; Sun, 6 Feb 2022 16:19:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245011AbiBFQTC (ORCPT ); Sun, 6 Feb 2022 11:19:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244735AbiBFQSa (ORCPT ); Sun, 6 Feb 2022 11:18:30 -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 B0196C06173B for ; Sun, 6 Feb 2022 08:18:29 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF7-0001bS-UP; Sun, 06 Feb 2022 17:18:26 +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/14] staging: r8188eu: in_cta_test is always 0 Date: Sun, 6 Feb 2022 17:18:06 +0100 Message-Id: <20220206161809.423031-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" in_cta_test in struct adapter is never set, so it's always 0. Remove in_cta_test and related dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 16 ++-------------- drivers/staging/r8188eu/include/drv_types.h | 2 -- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 0c0b7e819518..03966a1e247e 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1111,13 +1111,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) { rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSI= D_BCN); } else { - if (Adapter->in_cta_test) { - u32 v =3D rtw_read32(Adapter, REG_RCR); - v &=3D ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/* RCR_ADF */ - rtw_write32(Adapter, REG_RCR, v); - } else { - rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSS= ID_BCN); - } + rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSI= D_BCN); } } break; @@ -1131,13 +1125,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) /* enable to rx data frame.Accept all data frame */ rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF); =20 - if (Adapter->in_cta_test) { - u32 v =3D rtw_read32(Adapter, REG_RCR); - v &=3D ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/* RCR_ADF */ - rtw_write32(Adapter, REG_RCR, v); - } else { - rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSS= ID_DATA | RCR_CBSSID_BCN); - } + rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSI= D_DATA | RCR_CBSSID_BCN); =20 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) RetryLimit =3D 48; diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 4553cfda0aa4..3d5eb37a4c51 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -232,8 +232,6 @@ struct adapter { unsigned char br_mac[ETH_ALEN]; unsigned char br_ip[4]; struct br_ext_info ethBrExtInfo; - - unsigned char in_cta_test; }; =20 #define adapter_to_dvobj(adapter) (adapter->dvobj) --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 8752DC433F5 for ; Sun, 6 Feb 2022 16:19:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245578AbiBFQTG (ORCPT ); Sun, 6 Feb 2022 11:19:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244746AbiBFQSb (ORCPT ); Sun, 6 Feb 2022 11:18:31 -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 1C860C043184 for ; Sun, 6 Feb 2022 08:18:30 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF8-0001bS-Ny; Sun, 06 Feb 2022 17:18:26 +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/14] staging: r8188eu: irq_alloc is not used Date: Sun, 6 Feb 2022 17:18:07 +0100 Message-Id: <20220206161809.423031-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" irq_alloc in struct dvobj_priv is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 3d5eb37a4c51..b02940accc4e 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -133,8 +133,6 @@ struct dvobj_priv { int RtOutPipe[3]; u8 Queue2Pipe[HW_QUEUE_ENTRY];/* for out pipe mapping */ =20 - u8 irq_alloc; - struct rt_firmware firmware; =20 /*-------- below is for USB INTERFACE --------*/ --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 9E674C433EF for ; Sun, 6 Feb 2022 16:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343801AbiBFQTJ (ORCPT ); Sun, 6 Feb 2022 11:19:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244751AbiBFQSc (ORCPT ); Sun, 6 Feb 2022 11:18:32 -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 F1B16C043189 for ; Sun, 6 Feb 2022 08:18:31 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkF9-0001bS-Gx; Sun, 06 Feb 2022 17:18:27 +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 13/14] staging: r8188eu: not_indic_disco is unused Date: Sun, 6 Feb 2022 17:18:08 +0100 Message-Id: <20220206161809.423031-14-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" not_indic_disco in struct mlme_priv is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 77169c15080a..30ee46ccdb21 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -316,7 +316,6 @@ struct mlme_priv { =20 u8 *nic_hdl; =20 - u8 not_indic_disco; struct list_head *pscanned; struct __queue free_bss_pool; struct __queue scanned_queue; --=20 2.30.2 From nobody Mon Jun 29 16:47:11 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 2B7EFC433F5 for ; Sun, 6 Feb 2022 16:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344194AbiBFQTQ (ORCPT ); Sun, 6 Feb 2022 11:19:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244748AbiBFQSd (ORCPT ); Sun, 6 Feb 2022 11:18:33 -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 47C27C043184 for ; Sun, 6 Feb 2022 08:18:32 -0800 (PST) Received: from ipservice-092-217-075-184.092.217.pools.vodafone-ip.de ([92.217.75.184] 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 1nGkFA-0001bS-Bu; Sun, 06 Feb 2022 17:18:28 +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 14/14] staging: r8188eu: remove unused struct hostapd_priv Date: Sun, 6 Feb 2022 17:18:09 +0100 Message-Id: <20220206161809.423031-15-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220206161809.423031-1-martin@kaiser.cx> References: <20220206161809.423031-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" struct hostapd_priv contains only a pointer to struct adapter. Remove this struct and the unused phostapdpriv pointer in struct adapter. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/rtw_mlme.h | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index b02940accc4e..987dae613d8b 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -174,7 +174,6 @@ struct adapter { struct pwrctrl_priv pwrctrlpriv; struct eeprom_priv eeprompriv; struct led_priv ledpriv; - struct hostapd_priv *phostapdpriv; struct wifidirect_info wdinfo; =20 struct hal_data_8188e haldata; diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 30ee46ccdb21..ed2a50bad66e 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -416,10 +416,6 @@ struct mlme_priv { u8 update_bcn; }; =20 -struct hostapd_priv { - struct adapter *padapter; -}; - int hostapd_mode_init(struct adapter *padapter); void hostapd_mode_unload(struct adapter *padapter); =20 --=20 2.30.2