From: Michael Straube <straube.linux@gmail.com>
To: Martin Kaiser <martin@kaiser.cx>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/8] staging: r8188eu: interface type is always usb
Date: Sun, 17 Oct 2021 13:46:34 +0200 [thread overview]
Message-ID: <b17bbae4-2297-3247-a40b-38a0de1afafd@gmail.com> (raw)
In-Reply-To: <20211016113008.27549-3-martin@kaiser.cx>
On 10/16/21 13:30, Martin Kaiser wrote:
> SupportInterface in struct odm_dm_struct is always ODM_ITRF_USB.
> Remove the variable and the code to configure the interface.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 9 +++------
> drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 3 +--
> drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 3 +--
> drivers/staging/r8188eu/hal/odm.c | 3 ---
> drivers/staging/r8188eu/hal/rtl8188e_dm.c | 2 --
> drivers/staging/r8188eu/include/odm.h | 11 +----------
> 6 files changed, 6 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
> index 17b55c31f6eb..a623e0aaa0d0 100644
> --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
> +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
> @@ -176,7 +176,6 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm)
> {
> u32 hex = 0;
> u32 i = 0;
> - u8 interfaceValue = dm_odm->SupportInterface;
> u32 arraylen = sizeof(array_agc_tab_1t_8188e) / sizeof(u32);
> u32 *array = array_agc_tab_1t_8188e;
> bool biol = false;
> @@ -185,7 +184,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm)
> u8 bndy_cnt = 1;
> enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
>
> - hex += interfaceValue << 8;
> + hex += ODM_ITRF_USB << 8;
> hex += ODM_CE << 16;
> hex += 0xFF000000;
> biol = rtw_IOL_applied(adapter);
> @@ -453,7 +452,6 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm)
> {
> u32 hex = 0;
> u32 i = 0;
> - u8 interfaceValue = dm_odm->SupportInterface;
> u32 arraylen = sizeof(array_phy_reg_1t_8188e) / sizeof(u32);
> u32 *array = array_phy_reg_1t_8188e;
> bool biol = false;
> @@ -461,7 +459,7 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm)
> struct xmit_frame *pxmit_frame = NULL;
> u8 bndy_cnt = 1;
> enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
> - hex += interfaceValue << 8;
> + hex += ODM_ITRF_USB << 8;
> hex += ODM_CE << 16;
> hex += 0xFF000000;
> biol = rtw_IOL_applied(adapter);
> @@ -659,11 +657,10 @@ void ODM_ReadAndConfig_PHY_REG_PG_8188E(struct odm_dm_struct *dm_odm)
> {
> u32 hex;
> u32 i = 0;
> - u8 interfaceValue = dm_odm->SupportInterface;
> u32 arraylen = sizeof(array_phy_reg_pg_8188e) / sizeof(u32);
> u32 *array = array_phy_reg_pg_8188e;
>
> - hex = interfaceValue << 8;
> + hex = ODM_ITRF_USB << 8;
> hex += (ODM_CE << 16) + 0xFF000000;
>
> for (i = 0; i < arraylen; i += 3) {
> diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
> index bb57e93eb959..b4c55863d3fb 100644
> --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
> +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
> @@ -133,7 +133,6 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm)
>
> u32 hex = 0;
> u32 i;
> - u8 interface_val = dm_odm->SupportInterface;
> u32 array_len = sizeof(array_MAC_REG_8188E) / sizeof(u32);
> u32 *array = array_MAC_REG_8188E;
> bool biol = false;
> @@ -142,7 +141,7 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm)
> struct xmit_frame *pxmit_frame = NULL;
> u8 bndy_cnt = 1;
> enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
> - hex += interface_val << 8;
> + hex += ODM_ITRF_USB << 8;
> hex += ODM_CE << 16;
> hex += 0xFF000000;
>
> diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
> index 7a8faa7885a1..3e2a09fc2619 100644
> --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
> +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
> @@ -144,7 +144,6 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
>
> u32 hex = 0;
> u32 i = 0;
> - u8 interfaceValue = pDM_Odm->SupportInterface;
> u32 ArrayLen = sizeof(Array_RadioA_1T_8188E) / sizeof(u32);
> u32 *Array = Array_RadioA_1T_8188E;
> bool biol = false;
> @@ -153,7 +152,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
> u8 bndy_cnt = 1;
> enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
>
> - hex += interfaceValue << 8;
> + hex += ODM_ITRF_USB << 8;
> hex += ODM_CE << 16;
> hex += 0xFF000000;
> biol = rtw_IOL_applied(Adapter);
> diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
> index 2178ffe41bb3..a90597b82e12 100644
> --- a/drivers/staging/r8188eu/hal/odm.c
> +++ b/drivers/staging/r8188eu/hal/odm.c
> @@ -214,9 +214,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
> case ODM_CMNINFO_ABILITY:
> pDM_Odm->SupportAbility = (u32)Value;
> break;
> - case ODM_CMNINFO_INTERFACE:
> - pDM_Odm->SupportInterface = (u8)Value;
> - break;
> case ODM_CMNINFO_MP_TEST_CHIP:
> pDM_Odm->bIsMPChip = (u8)Value;
> break;
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> index 1ca24a507d6d..869d95f3cf33 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> @@ -33,8 +33,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
>
> dm_odm->Adapter = Adapter;
>
> - ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, ODM_ITRF_USB);
> -
> ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data->VersionID));
>
> if (hal_data->rf_type == RF_1T1R)
> diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
> index 187f872d09b5..ba936d30a0db 100644
> --- a/drivers/staging/r8188eu/include/odm.h
> +++ b/drivers/staging/r8188eu/include/odm.h
> @@ -262,7 +262,6 @@ enum odm_common_info_def {
>
> /* HOOK BEFORE REG INIT----------- */
> ODM_CMNINFO_ABILITY, /* ODM_ABILITY_E */
> - ODM_CMNINFO_INTERFACE, /* ODM_INTERFACE_E */
> ODM_CMNINFO_MP_TEST_CHIP,
> ODM_CMNINFO_RF_TYPE, /* RF_PATH_E or ODM_RF_TYPE_E? */
> /* HOOK BEFORE REG INIT----------- */
> @@ -343,13 +342,7 @@ enum odm_ability_def {
> ODM_RF_CALIBRATION = BIT(26),
> };
>
> -/* ODM_CMNINFO_INTERFACE */
> -enum odm_interface_def {
> - ODM_ITRF_PCIE = 0x1,
> - ODM_ITRF_USB = 0x2,
> - ODM_ITRF_SDIO = 0x4,
> - ODM_ITRF_ALL = 0x7,
> -};
> +# define ODM_ITRF_USB 0x2
>
> /* ODM_CMNINFO_RF_TYPE */
> /* For example 1T2R (A+AB = BIT(0)|BIT(4)|BIT(5)) */
> @@ -611,8 +604,6 @@ struct odm_dm_struct {
> /* HOOK BEFORE REG INIT----------- */
> /* ODM Support Ability DIG/RATR/TX_PWR_TRACK/ �K�K = 1/2/3/�K */
> u32 SupportAbility;
> - /* ODM PCIE/USB/SDIO/GSPI = 0/1/2/3 */
> - u8 SupportInterface;
> /* RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */
> u8 RFType;
>
>
Acked-by: Michael Straube <straube.linux@gmail.com>
next prev parent reply other threads:[~2021-10-17 11:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-16 11:30 [PATCH 0/8] staging: r8188eu: another round of removals Martin Kaiser
2021-10-16 11:30 ` [PATCH 1/8] staging: r8188eu: remove empty trigger gpio code Martin Kaiser
2021-10-17 11:23 ` Michael Straube
2021-10-16 11:30 ` [PATCH 2/8] staging: r8188eu: interface type is always usb Martin Kaiser
2021-10-17 11:46 ` Michael Straube [this message]
2021-10-16 11:30 ` [PATCH 3/8] staging: r8188eu: remove two checks that are always false Martin Kaiser
2021-10-17 11:48 ` Michael Straube
2021-10-16 11:30 ` [PATCH 4/8] staging: r8188eu: remove unused function prototypes Martin Kaiser
2021-10-17 11:50 ` Michael Straube
2021-10-16 11:30 ` [PATCH 5/8] staging: r8188eu: PHY_SetRFPathSwitch_8188E is not used Martin Kaiser
2021-10-17 11:53 ` Michael Straube
2021-10-16 11:30 ` [PATCH 6/8] staging: r8188eu: clean up Hal8188EPhyCfg.h Martin Kaiser
2021-10-17 11:54 ` Michael Straube
2021-10-16 11:30 ` [PATCH 7/8] staging: r8188eu: remove procfs functions Martin Kaiser
2021-10-17 11:56 ` Michael Straube
2021-10-16 11:30 ` [PATCH 8/8] staging: r8188eu: CurrentWirelessMode is not used Martin Kaiser
2021-10-17 11:57 ` Michael Straube
2021-10-16 15:34 ` [PATCH 0/8] staging: r8188eu: another round of removals Phillip Potter
2021-10-16 16:33 ` Martin Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b17bbae4-2297-3247-a40b-38a0de1afafd@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox