From nobody Tue Jun 30 20:11:00 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 CB38BC433EF for ; Mon, 10 Jan 2022 12:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245653AbiAJMqx (ORCPT ); Mon, 10 Jan 2022 07:46:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234215AbiAJMqv (ORCPT ); Mon, 10 Jan 2022 07:46: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 1EDA8C061748 for ; Mon, 10 Jan 2022 04:46:51 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4V-0007Td-Ai; Mon, 10 Jan 2022 13:46: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 1/9] staging: r8188eu: fix phy_RF6052_Config_ParaFile error handling Date: Mon, 10 Jan 2022 13:46:30 +0100 Message-Id: <20220110124638.6909-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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" Fix the error handling in phy_RF6052_Config_ParaFile. We can simply return rtStatus. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index 6e0231099986..7e4744989a66 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -406,12 +406,6 @@ static int phy_RF6052_Config_ParaFile(struct adapter *= Adapter) /*----Restore RFENV control type----*/; rtl8188e_PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); =20 - if (rtStatus !=3D _SUCCESS) - goto phy_RF6052_Config_ParaFile_Fail; - - return rtStatus; - -phy_RF6052_Config_ParaFile_Fail: return rtStatus; } =20 --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 B78DBC433EF for ; Mon, 10 Jan 2022 12:47:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245676AbiAJMq6 (ORCPT ); Mon, 10 Jan 2022 07:46:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245632AbiAJMqx (ORCPT ); Mon, 10 Jan 2022 07:46: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 55FECC061756 for ; Mon, 10 Jan 2022 04:46:52 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4W-0007Td-Ee; Mon, 10 Jan 2022 13:46: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 2/9] staging: r8188eu: remove a constant variable Date: Mon, 10 Jan 2022 13:46:31 +0100 Message-Id: <20220110124638.6909-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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 eRFPath variable in phy_RF6052_Config_ParaFile is always 0. Remove the variable and use 0 directly. (enum rf_radio_path)eRFPath can be replaced with RF_PATH_A, which is defined as 0. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index 7e4744989a66..7474db05e8af 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -374,12 +374,11 @@ static int phy_RF6052_Config_ParaFile(struct adapter = *Adapter) struct bb_reg_def *pPhyReg; struct hal_data_8188e *pHalData =3D &Adapter->haldata; u32 u4RegValue =3D 0; - u8 eRFPath =3D 0; int rtStatus =3D _SUCCESS; =20 /* Initialize RF */ =20 - pPhyReg =3D &pHalData->PHYRegDef[eRFPath]; + pPhyReg =3D &pHalData->PHYRegDef[0]; =20 /*----Store original RFENV control type----*/ u4RegValue =3D rtl8188e_PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_R= FENV); @@ -400,7 +399,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *A= dapter) udelay(1);/* PlatformStallExecution(1); */ =20 /*----Initialize RF fom connfiguration file----*/ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv, RF_PATH_A, RF_PATH_A)) rtStatus =3D _FAIL; =20 /*----Restore RFENV control type----*/; --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 7CCBBC433F5 for ; Mon, 10 Jan 2022 12:47:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245714AbiAJMrG (ORCPT ); Mon, 10 Jan 2022 07:47:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245654AbiAJMqy (ORCPT ); Mon, 10 Jan 2022 07:46: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 72853C06173F for ; Mon, 10 Jan 2022 04:46:53 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4X-0007Td-Ii; Mon, 10 Jan 2022 13:46: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 3/9] staging: r8188eu: remove unused function parameter Date: Mon, 10 Jan 2022 13:46:32 +0100 Message-Id: <20220110124638.6909-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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" ODM_ConfigRFWithHeaderFile does not use its content parameter. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 1 - drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/include/odm_HWConfig.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index d5212a166dd2..a62af532ac82 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -363,7 +363,6 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm, } =20 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm, - enum rf_radio_path content, enum rf_radio_path rfpath) { if (rfpath =3D=3D RF_PATH_A) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index 7474db05e8af..a5c94be95ccb 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -399,7 +399,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *A= dapter) udelay(1);/* PlatformStallExecution(1); */ =20 /*----Initialize RF fom connfiguration file----*/ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv, RF_PATH_A, RF_PATH_A)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv, RF_PATH_A)) rtStatus =3D _FAIL; =20 /*----Restore RFENV control type----*/; diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/stagi= ng/r8188eu/include/odm_HWConfig.h index 3ed265e00ac1..efc809354720 100644 --- a/drivers/staging/r8188eu/include/odm_HWConfig.h +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h @@ -96,7 +96,6 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *pDM_Odm, struct adapter *adapt); =20 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm, - enum rf_radio_path Content, enum rf_radio_path eRFPath); =20 enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm, --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 A2BCEC433EF for ; Mon, 10 Jan 2022 12:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245681AbiAJMrK (ORCPT ); Mon, 10 Jan 2022 07:47:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245656AbiAJMqz (ORCPT ); Mon, 10 Jan 2022 07:46: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 86E84C06173F for ; Mon, 10 Jan 2022 04:46:54 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4Y-0007Td-Ie; Mon, 10 Jan 2022 13:46: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 4/9] staging: r8188eu: remove constant function parameter Date: Mon, 10 Jan 2022 13:46:33 +0100 Message-Id: <20220110124638.6909-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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 ODM_ConfigRFWithHeaderFile sets rfpath to RF_PATH_A. Remove the parameter and the check for RF_PATH_A inside the function. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 6 ++---- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/include/odm_HWConfig.h | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index a62af532ac82..ef35e3c31794 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -362,11 +362,9 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm, odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo); } =20 -enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm, - enum rf_radio_path rfpath) +enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm) { - if (rfpath =3D=3D RF_PATH_A) - READ_AND_CONFIG(8188E, _RadioA_1T_); + READ_AND_CONFIG(8188E, _RadioA_1T_); =20 return HAL_STATUS_SUCCESS; } diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index a5c94be95ccb..d10a6cc2d4ab 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -399,7 +399,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *A= dapter) udelay(1);/* PlatformStallExecution(1); */ =20 /*----Initialize RF fom connfiguration file----*/ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv, RF_PATH_A)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigRFWithHeaderFile(&pHalData->odmpr= iv)) rtStatus =3D _FAIL; =20 /*----Restore RFENV control type----*/; diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/stagi= ng/r8188eu/include/odm_HWConfig.h index efc809354720..aa468ce34b7e 100644 --- a/drivers/staging/r8188eu/include/odm_HWConfig.h +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h @@ -95,8 +95,7 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *pDM_Odm, struct odm_per_pkt_info *pPktinfo, struct adapter *adapt); =20 -enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm, - enum rf_radio_path eRFPath); +enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm); =20 enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm, enum odm_bb_config_type ConfigType); --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 DD88CC433EF for ; Mon, 10 Jan 2022 12:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245738AbiAJMrP (ORCPT ); Mon, 10 Jan 2022 07:47:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245661AbiAJMq4 (ORCPT ); Mon, 10 Jan 2022 07:46:56 -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 CA325C06173F for ; Mon, 10 Jan 2022 04:46:55 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4Z-0007Td-Ir; Mon, 10 Jan 2022 13:46:51 +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: r8188eu: replace the READ_AND_CONFIG Date: Mon, 10 Jan 2022 13:46:34 +0100 Message-Id: <20220110124638.6909-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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 READ_AND_CONFIG macro builds a function name from chip type and table name. Remove the macro and use the resulting function names directly. This makes the code easier to read. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index ef35e3c31794..2f0752418fe2 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -3,10 +3,6 @@ =20 #include "../include/drv_types.h" =20 -#define READ_AND_CONFIG READ_AND_CONFIG_MP - -#define READ_AND_CONFIG_MP(ic, txt) (ODM_ReadAndConfig##txt##ic(dm_odm)) - static u8 odm_QueryRxPwrPercentage(s8 AntPower) { if ((AntPower <=3D -100) || (AntPower >=3D 20)) @@ -364,7 +360,7 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm, =20 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm) { - READ_AND_CONFIG(8188E, _RadioA_1T_); + ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm); =20 return HAL_STATUS_SUCCESS; } @@ -372,20 +368,17 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm= _dm_struct *dm_odm) enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm, enum odm_bb_config_type config_tp) { - if (config_tp =3D=3D CONFIG_BB_PHY_REG) { - READ_AND_CONFIG(8188E, _PHY_REG_1T_); - } else if (config_tp =3D=3D CONFIG_BB_AGC_TAB) { - READ_AND_CONFIG(8188E, _AGC_TAB_1T_); - } else if (config_tp =3D=3D CONFIG_BB_PHY_REG_PG) { - READ_AND_CONFIG(8188E, _PHY_REG_PG_); - } + if (config_tp =3D=3D CONFIG_BB_PHY_REG) + ODM_ReadAndConfig_PHY_REG_1T_8188E(dm_odm); + else if (config_tp =3D=3D CONFIG_BB_AGC_TAB) + ODM_ReadAndConfig_AGC_TAB_1T_8188E(dm_odm); + else if (config_tp =3D=3D CONFIG_BB_PHY_REG_PG) + ODM_ReadAndConfig_PHY_REG_PG_8188E(dm_odm); =20 return HAL_STATUS_SUCCESS; } =20 enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm) { - u8 result =3D HAL_STATUS_SUCCESS; - result =3D READ_AND_CONFIG(8188E, _MAC_REG_); - return result; + return ODM_ReadAndConfig_MAC_REG_8188E(dm_odm); } --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 C9CFBC433F5 for ; Mon, 10 Jan 2022 12:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245671AbiAJMrT (ORCPT ); Mon, 10 Jan 2022 07:47:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245667AbiAJMq5 (ORCPT ); Mon, 10 Jan 2022 07:46:57 -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 95393C061748 for ; Mon, 10 Jan 2022 04:46:56 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4a-0007Td-Kc; Mon, 10 Jan 2022 13:46:52 +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: r8188eu: relay errors from ODM_ReadAndConfig_... Date: Mon, 10 Jan 2022 13:46:35 +0100 Message-Id: <20220110124638.6909-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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" Most of the ODM_ReadAndConfig_... functions return an error status. Update their callers to process these return values. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 2f0752418fe2..5ec9a04be26b 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -360,22 +360,22 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm, =20 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm) { - ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm); - - return HAL_STATUS_SUCCESS; + return ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm); } =20 enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm, enum odm_bb_config_type config_tp) { - if (config_tp =3D=3D CONFIG_BB_PHY_REG) - ODM_ReadAndConfig_PHY_REG_1T_8188E(dm_odm); - else if (config_tp =3D=3D CONFIG_BB_AGC_TAB) - ODM_ReadAndConfig_AGC_TAB_1T_8188E(dm_odm); - else if (config_tp =3D=3D CONFIG_BB_PHY_REG_PG) + if (config_tp =3D=3D CONFIG_BB_PHY_REG) { + return ODM_ReadAndConfig_PHY_REG_1T_8188E(dm_odm); + } else if (config_tp =3D=3D CONFIG_BB_AGC_TAB) { + return ODM_ReadAndConfig_AGC_TAB_1T_8188E(dm_odm); + } else if (config_tp =3D=3D CONFIG_BB_PHY_REG_PG) { ODM_ReadAndConfig_PHY_REG_PG_8188E(dm_odm); + return HAL_STATUS_SUCCESS; + } =20 - return HAL_STATUS_SUCCESS; + return HAL_STATUS_FAILURE; } =20 enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm) --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 DB282C433F5 for ; Mon, 10 Jan 2022 12:47:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343537AbiAJMrd (ORCPT ); Mon, 10 Jan 2022 07:47:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245669AbiAJMq5 (ORCPT ); Mon, 10 Jan 2022 07:46:57 -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 110D8C06173F for ; Mon, 10 Jan 2022 04:46:57 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4b-0007Td-IB; Mon, 10 Jan 2022 13:46:53 +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: r8188eu: merge ODM_ConfigMACWithHeaderFile into PHY_MACConfig8188E Date: Mon, 10 Jan 2022 13:46:36 +0100 Message-Id: <20220110124638.6909-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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_ConfigMACWithHeaderFile function is only one line. Merge it into PHY_MACConfig8188E, which is its only caller. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 5 ----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/odm_HWConfig.h | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 5ec9a04be26b..1c3074fc6be4 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -377,8 +377,3 @@ enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_d= m_struct *dm_odm, =20 return HAL_STATUS_FAILURE; } - -enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm) -{ - return ODM_ReadAndConfig_MAC_REG_8188E(dm_odm); -} diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index c1639df8b1e7..15370b674e53 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -342,7 +342,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) /* */ /* Config MAC */ /* */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigMACWithHeaderFile(&pHalData->odmp= riv)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->= odmpriv)) rtStatus =3D _FAIL; =20 /* 2010.07.13 AMPDU aggregation number B */ diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/stagi= ng/r8188eu/include/odm_HWConfig.h index aa468ce34b7e..3a8c041dbb66 100644 --- a/drivers/staging/r8188eu/include/odm_HWConfig.h +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h @@ -99,7 +99,4 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_= struct *pDM_Odm); =20 enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm, enum odm_bb_config_type ConfigType); - -enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *pDM_Odm); - #endif --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 AD1DEC433F5 for ; Mon, 10 Jan 2022 12:47:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343577AbiAJMrv (ORCPT ); Mon, 10 Jan 2022 07:47:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245684AbiAJMq6 (ORCPT ); Mon, 10 Jan 2022 07:46:58 -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 894F6C061757 for ; Mon, 10 Jan 2022 04:46:58 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4c-0007Td-JI; Mon, 10 Jan 2022 13:46:54 +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: r8188eu: remove unused cck, ofdm and mcs rate defines Date: Mon, 10 Jan 2022 13:46:37 +0100 Message-Id: <20220110124638.6909-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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 for cck, ofdm and mcs rates. Signed-off-by: Martin Kaiser --- .../staging/r8188eu/include/odm_HWConfig.h | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/stagi= ng/r8188eu/include/odm_HWConfig.h index 3a8c041dbb66..1bd6f254bf53 100644 --- a/drivers/staging/r8188eu/include/odm_HWConfig.h +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h @@ -4,42 +4,13 @@ #ifndef __HALHWOUTSRC_H__ #define __HALHWOUTSRC_H__ =20 -/* Definition */ /* CCK Rates, TxHT =3D 0 */ #define DESC92C_RATE1M 0x00 -#define DESC92C_RATE2M 0x01 -#define DESC92C_RATE5_5M 0x02 #define DESC92C_RATE11M 0x03 =20 -/* OFDM Rates, TxHT =3D 0 */ -#define DESC92C_RATE6M 0x04 -#define DESC92C_RATE9M 0x05 -#define DESC92C_RATE12M 0x06 -#define DESC92C_RATE18M 0x07 -#define DESC92C_RATE24M 0x08 -#define DESC92C_RATE36M 0x09 -#define DESC92C_RATE48M 0x0a -#define DESC92C_RATE54M 0x0b - /* MCS Rates, TxHT =3D 1 */ -#define DESC92C_RATEMCS0 0x0c -#define DESC92C_RATEMCS1 0x0d -#define DESC92C_RATEMCS2 0x0e -#define DESC92C_RATEMCS3 0x0f -#define DESC92C_RATEMCS4 0x10 -#define DESC92C_RATEMCS5 0x11 -#define DESC92C_RATEMCS6 0x12 -#define DESC92C_RATEMCS7 0x13 #define DESC92C_RATEMCS8 0x14 -#define DESC92C_RATEMCS9 0x15 -#define DESC92C_RATEMCS10 0x16 -#define DESC92C_RATEMCS11 0x17 -#define DESC92C_RATEMCS12 0x18 -#define DESC92C_RATEMCS13 0x19 -#define DESC92C_RATEMCS14 0x1a #define DESC92C_RATEMCS15 0x1b -#define DESC92C_RATEMCS15_SG 0x1c -#define DESC92C_RATEMCS32 0x20 =20 /* structure and define */ =20 --=20 2.30.2 From nobody Tue Jun 30 20:11:00 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 6B072C433F5 for ; Mon, 10 Jan 2022 12:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343592AbiAJMr7 (ORCPT ); Mon, 10 Jan 2022 07:47:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245705AbiAJMrC (ORCPT ); Mon, 10 Jan 2022 07:47:02 -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 37FEEC06175C for ; Mon, 10 Jan 2022 04:47:00 -0800 (PST) Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] 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 1n6u4d-0007Td-Ux; Mon, 10 Jan 2022 13:46:56 +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: r8188eu: merge ODM_ConfigBBWithHeaderFile with its callers Date: Mon, 10 Jan 2022 13:46:38 +0100 Message-Id: <20220110124638.6909-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110124638.6909-1-martin@kaiser.cx> References: <20220110124638.6909-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" ODM_ConfigBBWithHeaderFile is a "multiplexer" for ODM_ReadAndConfig_... functions. It's called only from phy_BB8188E_Config_ParaFile. We can remove ODM_ConfigBBWithHeaderFile and call the ODM_ReadAndConfig_... functions directly. ODM_ReadAndConfig_PHY_REG_PG_8188E does not return an error status, there's no need for a check. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm_HWConfig.c | 15 --------------- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +++----- drivers/staging/r8188eu/include/odm_HWConfig.h | 3 --- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 1c3074fc6be4..dcc38b036280 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -362,18 +362,3 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_= dm_struct *dm_odm) { return ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm); } - -enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm, - enum odm_bb_config_type config_tp) -{ - if (config_tp =3D=3D CONFIG_BB_PHY_REG) { - return ODM_ReadAndConfig_PHY_REG_1T_8188E(dm_odm); - } else if (config_tp =3D=3D CONFIG_BB_AGC_TAB) { - return ODM_ReadAndConfig_AGC_TAB_1T_8188E(dm_odm); - } else if (config_tp =3D=3D CONFIG_BB_PHY_REG_PG) { - ODM_ReadAndConfig_PHY_REG_PG_8188E(dm_odm); - return HAL_STATUS_SUCCESS; - } - - return HAL_STATUS_FAILURE; -} diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 15370b674e53..0b0690dfb947 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -493,7 +493,7 @@ static int phy_BB8188E_Config_ParaFile(struct adapter *= Adapter) /* 1. Read PHY_REG.TXT BB INIT!! */ /* We will separate as 88C / 92C according to chip version */ /* */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigBBWithHeaderFile(&pHalData->odmpr= iv, CONFIG_BB_PHY_REG)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_PHY_REG_1T_8188E(&pHalDat= a->odmpriv)) rtStatus =3D _FAIL; if (rtStatus !=3D _SUCCESS) goto phy_BB8190_Config_ParaFile_Fail; @@ -501,16 +501,14 @@ static int phy_BB8188E_Config_ParaFile(struct adapter= *Adapter) /* 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ if (!pEEPROM->bautoload_fail_flag) { pHalData->pwrGroupCnt =3D 0; - - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigBBWithHeaderFile(&pHalData->odmp= riv, CONFIG_BB_PHY_REG_PG)) - rtStatus =3D _FAIL; + ODM_ReadAndConfig_PHY_REG_PG_8188E(&pHalData->odmpriv); } =20 if (rtStatus !=3D _SUCCESS) goto phy_BB8190_Config_ParaFile_Fail; =20 /* 3. BB AGC table Initialization */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ConfigBBWithHeaderFile(&pHalData->odmpr= iv, CONFIG_BB_AGC_TAB)) + if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_AGC_TAB_1T_8188E(&pHalDat= a->odmpriv)) rtStatus =3D _FAIL; =20 if (rtStatus !=3D _SUCCESS) diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/stagi= ng/r8188eu/include/odm_HWConfig.h index 1bd6f254bf53..b37962edb2ed 100644 --- a/drivers/staging/r8188eu/include/odm_HWConfig.h +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h @@ -67,7 +67,4 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *pDM_Odm, struct adapter *adapt); =20 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm); - -enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm, - enum odm_bb_config_type ConfigType); #endif --=20 2.30.2