2022-09-28 15:40:57

by Michael Straube

[permalink] [raw]
Subject: [PATCH 0/4] 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(-)

--
2.37.3


2022-09-28 15:50:10

by Michael Straube

[permalink] [raw]
Subject: [PATCH 4/4] staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int

The 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.

Signed-off-by: Michael Straube <[email protected]>
---
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(-)

diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
index 8d60eee7ab50..23b7205722b5 100644
--- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
+++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
@@ -173,7 +173,7 @@ static void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32
udelay(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;
}

/******************************************************************************
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index f31c1b7a469a..532c63bce0bf 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -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;
diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h b/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h
index 787fd2cf8d4e..0a290bc31c4d 100644
--- a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h
+++ b/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h
@@ -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
diff --git a/drivers/staging/r8188eu/include/odm_types.h b/drivers/staging/r8188eu/include/odm_types.h
index 08ba7a418ba8..76302df4b330 100644
--- a/drivers/staging/r8188eu/include/odm_types.h
+++ b/drivers/staging/r8188eu/include/odm_types.h
@@ -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) \
--
2.37.3

2022-09-28 16:24:04

by Philipp Hortmann

[permalink] [raw]
Subject: Re: [PATCH 0/4] staging: r8188eu: remove enum HAL_STATUS

On 9/28/22 16:43, Michael Straube wrote:
> 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(-)
>

Tested-by: Philipp Hortmann <[email protected]> # Edimax N150