staging: r8188eu: remove enum HAL_STATUS
cover staging: r8188eu: remove enum HAL_STATUS
This series converts four functions from return type 'enum HAL_STATUS' to 'int' and finally removes enum HAL_STATUS.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (4):
staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int
staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int
staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int
staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 18 ++++++++---------- .../staging/r8188eu/hal/HalHWImg8188E_MAC.c | 9 ++++----- drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 6 +++--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- .../staging/r8188eu/include/HalHWImg8188E_BB.h | 4 ++-- .../r8188eu/include/HalHWImg8188E_MAC.h | 3 +-- .../staging/r8188eu/include/HalHWImg8188E_RF.h | 2 +- drivers/staging/r8188eu/include/odm_types.h | 5 ----- 9 files changed, 24 insertions(+), 34 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/4 staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int
The function ODM_ReadAndConfig_MAC_REG_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.
--- drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c +4 -5
@@ -131,7 +131,7 @@ static void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u8 Datartw_write8 (pDM_Odm->Adapter, Addr, Data); } -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *dm_odm) +int ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *dm_odm) {#define READ_NEXT_PAIR (v1, v2, i) do { i += 2; v1 = array[i]; v2 = array[i + 1]; } while (0)
@@ -144,7 +144,6 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm)struct adapter *adapt = dm_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 ; hex +=0xFF000000 ;
@@ -155,7 +154,7 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm) pxmit_frame =rtw_IOL_accquire_xmit_frame (adapt);if (!pxmit_frame) {pr_info ("rtw_IOL_accquire_xmit_frame failed\n" ); -return HAL_STATUS_FAILURE ; +return -ENOMEM ; } }
@@ -206,8 +205,8 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm)if (biol) {if (!rtl8188e_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) {pr_info ("~~~ MAC IOL_exec_cmds Failed !!!\n" ); - rst =HAL_STATUS_FAILURE ; +return -1 ; } } -return rst; +return 0 ; }
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +1 -1
@@ -323,7 +323,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter)/* */ /* Config MAC */ /* */ -if (HAL_STATUS_FAILURE ==ODM_ReadAndConfig_MAC_REG_8188E (&pHalData->odmpriv)) +if (ODM_ReadAndConfig_MAC_REG_8188E (&pHalData->odmpriv)) rtStatus = _FAIL;/* 2010.07.13 AMPDU aggregation number B */
drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h +1 -2
@@ -7,7 +7,6 @@/****************************************************************************** * MAC_REG.TXT ******************************************************************************/ - -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *pDM_Odm); +int ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *pDM_Odm);#endif /* end of HWIMG_SUPPORT */
Signature · 1 line
2.37.3
PATCH 2/4 staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int
In reply to Michael StraubeThe 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.
--- drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_RF.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c +4 -5
@@ -160,7 +160,7 @@ static void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, uodm_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
@@ -396,7 +396,7 @@ 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
@@ -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 */
Signature · 1 line
2.37.3
PATCH 3/4 staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int
In reply to Michael StraubeThe function ODM_ReadAndConfig_PHY_REG_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.
--- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +4 -5
@@ -473,7 +473,7 @@ static void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 } } -enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E (struct odm_dm_struct *dm_odm) +int ODM_ReadAndConfig_PHY_REG_1T_8188E (struct odm_dm_struct *dm_odm) {u32 hex =0 ;u32 i =0 ;
@@ -483,7 +483,6 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm)struct adapter *adapter = dm_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 ; hex +=0xFF000000 ;
@@ -493,7 +492,7 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_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 ; } }
@@ -575,11 +574,11 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm) }if (biol) {if (!rtl8188e_IOL_exec_cmds_sync (dm_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_phycfg.c +1 -1
@@ -455,7 +455,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 ==ODM_ReadAndConfig_PHY_REG_1T_8188E (&pHalData->odmpriv)) +if (ODM_ReadAndConfig_PHY_REG_1T_8188E (&pHalData->odmpriv))return _FAIL;/* 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */
drivers/staging/r8188eu/include/HalHWImg8188E_BB.h +1 -1
@@ -16,7 +16,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *odm);* PHY_REG_1T.TXT ******************************************************************************/ -enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E (struct odm_dm_struct *odm); +int ODM_ReadAndConfig_PHY_REG_1T_8188E (struct odm_dm_struct *odm);/****************************************************************************** * PHY_REG_PG.TXT
Signature · 1 line
2.37.3
PATCH 4/4 staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int
In reply to Michael StraubeThe function ODM_ReadAndConfig_AGC_TAB_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 enum HAL_STATUS is unused now and we can remove it.
--- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 2 +- drivers/staging/r8188eu/include/odm_types.h | 5 ----- 4 files changed, 6 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +4 -5
@@ -173,7 +173,7 @@ static void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32udelay (1 ); } -enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E (struct odm_dm_struct *dm_odm) +int ODM_ReadAndConfig_AGC_TAB_1T_8188E (struct odm_dm_struct *dm_odm) {u32 hex =0 ;u32 i =0 ;
@@ -183,7 +183,6 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm)struct adapter *adapter = dm_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 ;
@@ -194,7 +193,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_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 ; } }
@@ -245,10 +244,10 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm)if (biol) {if (!rtl8188e_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) {printk ("~~~ %s IOL_exec_cmds Failed !!!\n" , __func__); - rst =HAL_STATUS_FAILURE ; +return -1 ; } } -return rst; +return 0 ; }/******************************************************************************
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +1 -1
@@ -465,7 +465,7 @@ static int phy_BB8188E_Config_ParaFile(struct adapter *Adapter) }/* 3. BB AGC table Initialization */ -if (HAL_STATUS_FAILURE ==ODM_ReadAndConfig_AGC_TAB_1T_8188E (&pHalData->odmpriv)) +if (ODM_ReadAndConfig_AGC_TAB_1T_8188E (&pHalData->odmpriv))return _FAIL;return _SUCCESS;
drivers/staging/r8188eu/include/HalHWImg8188E_BB.h +1 -1
@@ -10,7 +10,7 @@* AGC_TAB_1T.TXT ******************************************************************************/ -enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E (struct odm_dm_struct *odm); +int ODM_ReadAndConfig_AGC_TAB_1T_8188E (struct odm_dm_struct *odm);/****************************************************************************** * PHY_REG_1T.TXT
drivers/staging/r8188eu/include/odm_types.h +0 -5
@@ -6,11 +6,6 @@#define ODM_CE 0x04/* BIT(2) */ -enum HAL_STATUS { -HAL_STATUS_SUCCESS , -HAL_STATUS_FAILURE , -}; -#define SET_TX_DESC_ANTSEL_A_88E (__ptxdesc, __value) \ le32p_replace_bits((__le32 *)(__ptxdesc + 8), __value, BIT(24))#define SET_TX_DESC_ANTSEL_B_88E (__ptxdesc, __value) \
Signature · 1 line
2.37.3
Quoted 11 lines · Michael Straube
This series converts four functions from return type 'enum
HAL_STATUS' to 'int' and finally removes enumHAL_STATUS.Tested on
x86_64with Inter-Tech DMG-02.Michael Straube (4):
staging: r8188eu: convertODM_ReadAndConfig_MAC_REG_8188E()to int
staging: r8188eu: convertODM_ReadAndConfig_RadioA_1T_8188E()to int
staging: r8188eu: convertODM_ReadAndConfig_PHY_REG_1T_8188E()to int
staging: r8188eu: convertODM_ReadAndConfig_AGC_TAB_1T_8188E()to int
Quoted 11 lines
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 18 ++++++++---------- .../staging/r8188eu/hal/HalHWImg8188E_MAC.c | 9 ++++----- drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 6 +++--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- .../staging/r8188eu/include/HalHWImg8188E_BB.h | 4 ++-- .../r8188eu/include/HalHWImg8188E_MAC.h | 3 +-- .../staging/r8188eu/include/HalHWImg8188E_RF.h | 2 +- drivers/staging/r8188eu/include/odm_types.h | 5 ----- 9 files changed, 24 insertions(+), 34 deletions(-)