staging: r8188eu: convert phy_RF6052_Config_ParaFile() to common error logic

Convert the function phy_RF6052_Config_ParaFile() away from returning
_FAIL or _SUCCESS which uses inverted error logic. Use the common error
logic instead. Return 0 for success and negative values for failure.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230115210734.18610-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
index e5ec6e5..1988fb6 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
@@ -371,7 +371,7 @@ int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
        struct bb_reg_def *pPhyReg;
        struct hal_data_8188e *pHalData = &Adapter->haldata;
        u32 u4RegValue = 0;
-       int rtStatus = _SUCCESS;
+       int err;
 
        /* Initialize RF */
 
@@ -396,11 +396,10 @@ 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))
-               rtStatus = _FAIL;
+       err = ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv);
 
        /*----Restore RFENV control type----*/;
        rtl8188e_PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue);
 
-       return rtStatus;
+       return err;
 }

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 9ba6a52..cb36b42 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -610,9 +610,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
        if (status == _FAIL)
                goto exit;
 
-       status = phy_RF6052_Config_ParaFile(Adapter);
-       if (status == _FAIL)
-               goto exit;
+       if (phy_RF6052_Config_ParaFile(Adapter))
+               return _FAIL;
 
        status = rtl8188e_iol_efuse_patch(Adapter);
        if (status == _FAIL)