github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
Convert the function PHY_BBConfig8188E() 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-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube 2023-01-15 22:07:34 +01:00 committed by Greg Kroah-Hartman
parent c58bc596a8
commit 4193769b6d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
View File

@ -478,18 +478,17 @@ PHY_BBConfig8188E(
struct adapter *Adapter
)
{
int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = &Adapter->haldata;
u16 RegVal;
u8 CrystalCap;
int res;
int err;
phy_InitBBRFRegisterDefinition(Adapter);
/* Enable BB and RF */
res = rtw_read16(Adapter, REG_SYS_FUNC_EN, &RegVal);
if (res)
return _FAIL;
err = rtw_read16(Adapter, REG_SYS_FUNC_EN, &RegVal);
if (err)
return err;
rtw_write16(Adapter, REG_SYS_FUNC_EN, (u16)(RegVal | BIT(13) | BIT(0) | BIT(1)));
@ -500,14 +499,13 @@ PHY_BBConfig8188E(
rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | FEN_BB_GLB_RSTn | FEN_BBRSTB);
/* Config BB and AGC */
if (phy_BB8188E_Config_ParaFile(Adapter))
rtStatus = _FAIL;
err = phy_BB8188E_Config_ParaFile(Adapter);
/* write 0x24[16:11] = 0x24[22:17] = CrystalCap */
CrystalCap = pHalData->CrystalCap & 0x3F;
rtl8188e_PHY_SetBBReg(Adapter, REG_AFE_XTAL_CTRL, 0x7ff800, (CrystalCap | (CrystalCap << 6)));
return rtStatus;
return err;
}
static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,

5
drivers/staging/r8188eu/hal/usb_halinit.c
View File

@ -606,9 +606,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
/* */
/* d. Initialize BB related configurations. */
/* */
status = PHY_BBConfig8188E(Adapter);
if (status == _FAIL)
goto exit;
if (PHY_BBConfig8188E(Adapter))
return _FAIL;
if (phy_RF6052_Config_ParaFile(Adapter))
return _FAIL;