Re: [PATCH] staging: r8188eu: remove ODM_ConfigRFWithHeaderFile()

[Philipp Hortmann]

On 8/19/22 20:23, Michael Straube wrote:
> The function ODM_ConfigRFWithHeaderFile() is just a wrapper around
> ODM_ReadAndConfig_RadioA_1T_8188E(). Remove the wrapper and call
> ODM_ReadAndConfig_RadioA_1T_8188E() directly.
>
> Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
> ---
>   drivers/staging/r8188eu/hal/odm_HWConfig.c     | 5 -----
>   drivers/staging/r8188eu/hal/rtl8188e_rf6052.c  | 2 +-
>   drivers/staging/r8188eu/include/odm_HWConfig.h | 1 -
>   3 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r8188eu/hal/odm_HWConfig.c
> index 54cc3d7789cd..035d94b3458e 100644
> --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c
> +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c
> @@ -347,8 +347,3 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,
>   	odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus, pPktinfo, adapt);
>   	odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);
>   }
> -
> -enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm)
> -{
> -	return ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm);
> -}
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> index d043b7bc4142..237232432f37 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> @@ -396,7 +396,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
>   	udelay(1);/* PlatformStallExecution(1); */
>   
>   	/*----Initialize RF fom connfiguration file----*/
> -	if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv))
> +	if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv) == HAL_STATUS_FAILURE)
>   		rtStatus = _FAIL;
>   
>   	/*----Restore RFENV control type----*/;
> diff --git a/drivers/staging/r8188eu/include/odm_HWConfig.h b/drivers/staging/r8188eu/include/odm_HWConfig.h
> index b37962edb2ed..3f7185780e87 100644
> --- a/drivers/staging/r8188eu/include/odm_HWConfig.h
> +++ b/drivers/staging/r8188eu/include/odm_HWConfig.h
> @@ -66,5 +66,4 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *pDM_Odm,
>   			struct odm_per_pkt_info *pPktinfo,
>   			struct adapter *adapt);
>   
> -enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm);
>   #endif

Tested-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> # Edimax N150