Commit 9090b84a authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int 



The function ODM_ReadAndConfig_RadioA_1T_8188E() has return type
'enum HAL_STATUS'. Convert the return type to int and use common
kernel error logic. Return 0 on success and negative values on
failure. The goal is to get rid of enum HAL_STATUS in the end.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20220928144323.13164-3-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29c7dbbc

drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c

+4 −5
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u 
	odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, Addr | maskforPhySet);

}



enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)

int ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)

{

	#define READ_NEXT_PAIR(v1, v2, i) do	\

		 { i += 2; v1 = Array[i];	\
@@ -174,7 +174,6 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) 
	struct adapter *Adapter =  pDM_Odm->Adapter;

	struct xmit_frame *pxmit_frame = NULL;

	u8 bndy_cnt = 1;

	enum HAL_STATUS rst = HAL_STATUS_SUCCESS;



	hex += ODM_ITRF_USB << 8;

	hex += ODM_CE << 16;
@@ -185,7 +184,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) 
		pxmit_frame = rtw_IOL_accquire_xmit_frame(Adapter);

		if (!pxmit_frame) {

			pr_info("rtw_IOL_accquire_xmit_frame failed\n");

			return HAL_STATUS_FAILURE;

			return -ENOMEM;

		}

	}
@@ -262,9 +261,9 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) 
	}

	if (biol) {

		if (!rtl8188e_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {

			rst = HAL_STATUS_FAILURE;

			pr_info("~~~ IOL Config %s Failed !!!\n", __func__);

			return -1;

		}

	}

	return rst;

	return 0;

}

drivers/staging/r8188eu/hal/rtl8188e_rf6052.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) 
	udelay(1);/* PlatformStallExecution(1); */



	/*----Initialize RF fom connfiguration file----*/

	if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv) == HAL_STATUS_FAILURE)

	if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv))

		rtStatus = _FAIL;



	/*----Restore RFENV control type----*/;

drivers/staging/r8188eu/include/HalHWImg8188E_RF.h

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 
 *                           RadioA_1T.TXT

 ******************************************************************************/



enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *odm);

int ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *odm);



#endif /*  end of HWIMG_SUPPORT */