lkml.org 
[lkml]   [2022]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int
    Date
    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.

    Signed-off-by: Michael Straube <straube.linux@gmail.com>
    ---
    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(-)

    diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
    index e615bc37c74f..da71867bcca3 100644
    --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
    +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
    @@ -131,7 +131,7 @@ static void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u8 Data
    rtw_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;
    }
    diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
    index 731179635c54..7bcaddc9128b 100644
    --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
    +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
    @@ -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 */
    diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h b/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h
    index 391c1754b0b6..b3d67c1a8050 100644
    --- a/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h
    +++ b/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h
    @@ -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 */
    --
    2.37.3
    \
     
     \ /
      Last update: 2022-09-28 16:45    [W:5.061 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site